Changeset 893 for trunk/sources/HeuristicLab.Constraints

Timestamp:

12/03/08 21:53:41 (16 years ago)

Author:

gkronber

Message:

killed TrueConstraint and FalseConstraint (#416)

Location:

trunk/sources/HeuristicLab.Constraints

Files:

• FalseConstraint.cs (deleted)
• FalseConstraintView.Designer.cs (deleted)
• FalseConstraintView.cs (deleted)
• FalseConstraintView.resx (deleted)
• HeuristicLab.Constraints.csproj (modified) (5 diffs)
• NotConstraint.cs (modified) (4 diffs)
• NotConstraintView.cs (modified) (1 diff)
• TrueConstraint.cs (deleted)
• TrueConstraintView.Designer.cs (deleted)
• TrueConstraintView.cs (deleted)
• TrueConstraintView.resx (deleted)

trunk/sources/HeuristicLab.Constraints/HeuristicLab.Constraints.csproj

@@ -84 +84 @@
     </Compile>
     <Compile Include="IntBoundedConstraint.cs" />
-    <Compile Include="FalseConstraintView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="FalseConstraintView.Designer.cs">
-      <DependentUpon>FalseConstraintView.cs</DependentUpon>
-    </Compile>
     <Compile Include="IntBoundedConstraintView.cs">
       <SubType>UserControl</SubType>
@@ -125 +119 @@
       <DependentUpon>OrConstraintView.cs</DependentUpon>
     </Compile>
-    <Compile Include="FalseConstraint.cs" />
     <Compile Include="SubOperatorsConstraintAnalyser.cs" />
     <Compile Include="SubOperatorsTypeConstraint.cs" />
@@ -134 +127 @@
       <DependentUpon>SubOperatorsTypeConstraintView.cs</DependentUpon>
     </Compile>
-    <Compile Include="TrueConstraint.cs" />
     <Compile Include="HeuristicLabConstraintsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TrueConstraintView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="TrueConstraintView.Designer.cs">
-      <DependentUpon>TrueConstraintView.cs</DependentUpon>
-    </Compile>
     <Compile Include="VariableComparisonConstraint.cs" />
     <Compile Include="VariableComparisonConstraintView.cs">
@@ -182 +168 @@
       <DependentUpon>DoubleBoundedConstraintView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FalseConstraintView.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>FalseConstraintView.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="IntBoundedConstraintView.resx">
       <SubType>Designer</SubType>
@@ -209 +191 @@
       <DependentUpon>SubOperatorsTypeConstraintView.cs</DependentUpon>
       <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TrueConstraintView.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>TrueConstraintView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="VariableComparisonConstraintView.resx">

trunk/sources/HeuristicLab.Constraints/NotConstraint.cs

@@ -44 +44 @@
     public NotConstraint()
       : base() {
-      subConstraint = new FalseConstraint();
     }
 
     public override bool Check(IItem data) {
-      return !subConstraint.Check(data);
+      return (subConstraint == null) || (!subConstraint.Check(data));
     }
 
@@ -58 +57 @@
       NotConstraint clone = new NotConstraint();
       clonedObjects.Add(Guid, clone);
-      clone.SubConstraint = (ConstraintBase)SubConstraint.Clone();
+      if (subConstraint != null)
+        clone.SubConstraint = (ConstraintBase)SubConstraint.Clone();
       return clone;
     }
@@ -65 +65 @@
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      XmlNode sub = PersistenceManager.Persist("SubConstraint", SubConstraint, document, persistedObjects);
-      node.AppendChild(sub);
+      if (subConstraint != null) {
+        XmlNode sub = PersistenceManager.Persist("SubConstraint", SubConstraint, document, persistedObjects);
+        node.AppendChild(sub);
+      }
       return node;
     }
@@ -72 +74 @@
     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
-      subConstraint = (ConstraintBase)PersistenceManager.Restore(node.SelectSingleNode("SubConstraint"), restoredObjects);
+      XmlNode subNode =  node.SelectSingleNode("SubConstraint");
+      if(subNode!=null) 
+        subConstraint = (ConstraintBase)PersistenceManager.Restore(subNode, restoredObjects);
     }
     #endregion

trunk/sources/HeuristicLab.Constraints/NotConstraintView.cs

@@ -99 +99 @@
           NotConstraint.SubConstraint = (ConstraintBase)Activator.CreateInstance(itemTypes[subConstraintComboBox.SelectedIndex]);
         } catch (Exception) {
-          NotConstraint.SubConstraint = new FalseConstraint();
+          NotConstraint.SubConstraint = null;
         }
       }