Changeset 82 for trunk

Timestamp:

03/19/08 17:18:44 (16 years ago)

Author:

swagner

Message:

Fixed ticket #70

• added new data element NullData for representing a null value
• used NullData as value for the marker variable in CombinedOperator

Location:

trunk/sources

Files:

• HeuristicLab.Data/HeuristicLab.Data.csproj (modified) (1 diff)
• HeuristicLab.Data/NullData.cs (added)
• HeuristicLab.Operators/CombinedOperator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Data/HeuristicLab.Data.csproj

@@ -112 +112 @@
       <DependentUpon>ConstrainedDoubleDataView.cs</DependentUpon>
     </Compile>
+    <Compile Include="NullData.cs" />
     <Compile Include="IntMatrixDataView.cs">
       <SubType>UserControl</SubType>

trunk/sources/HeuristicLab.Operators/CombinedOperator.cs

@@ -69 +69 @@
       if (scope.GetVariable(Guid.ToString()) == null) { // contained operator not yet executed
         // add marker
-        scope.AddVariable(new Variable(Guid.ToString(), null));
+        scope.AddVariable(new Variable(Guid.ToString(), new NullData()));
 
         // add aliases