Changeset 206

Timestamp:

04/29/08 13:19:45 (16 years ago)

Author:

gkronber

Message:

minor changes

Location:

branches/ExperimentalFunctionsBaking

Files:

• BakedFunctionTree.cs (modified) (7 diffs)
• HeuristicLab.Functions.csproj (modified) (3 diffs)

branches/ExperimentalFunctionsBaking/BakedFunctionTree.cs

@@ -45 +45 @@
     }
 
-    internal BakedFunctionTree(IFunction function) : this() {
+    internal BakedFunctionTree(IFunction function)
+      : this() {
       code.Add(0);
       code.Add(MapFunction(function));
@@ -60 +61 @@
     }
 
-    internal BakedFunctionTree(IFunctionTree tree) : this() {
+    internal BakedFunctionTree(IFunctionTree tree)
+      : this() {
       code.Add(0);
       code.Add(MapFunction(tree.Function));
@@ -130 +132 @@
         }
         treesExpanded = false;
-        subTrees.Clear();
+        subTrees = null;
       }
     }
@@ -143 +145 @@
         }
         variablesExpanded = false;
-        variables.Clear();
+        variables = null;
       }
     }
@@ -198 +200 @@
           variablesExpanded = true;
           code[2] = 0;
-          code.RemoveRange(3, variables.Count); 
+          code.RemoveRange(3, variables.Count);
         }
         return variables;
@@ -241 +243 @@
         //  currentBranchIndex += branchLength;
         //}
-        
+
         //code.InsertRange(currentBranchIndex, ((BakedFunctionTree)tree).code);
         //code[0] = code[0] + 1;
@@ -268 +270 @@
 
     private int PC;
+    private double[] codeArr;
     public double Evaluate(Dataset dataset, int sampleIndex) {
       PC = 0;
       FlattenVariables();
       FlattenTrees();
+      if(codeArr == null) {
+        codeArr = new double[code.Count];
+        code.CopyTo(codeArr);
+      }
       return EvaluateBakedCode(dataset, sampleIndex);
     }

branches/ExperimentalFunctionsBaking/HeuristicLab.Functions.csproj

@@ -49 +49 @@
   <ItemGroup>
     <Compile Include="Addition.cs" />
-    <Compile Include="And.cs" />
+    <Compile Include="And.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Average.cs" />
     <Compile Include="BakedFunctionTree.cs" />
@@ -55 +57 @@
     <Compile Include="GreaterThan.cs" />
     <Compile Include="FunctionTree.cs" />
+    <Compile Include="IfThenElse.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="IFunctionTree.cs" />
     <Compile Include="ModelAnalyzerExporter.cs" />
+    <Compile Include="Or.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="ProgrammableFunction.cs" />
     <Compile Include="Equal.cs" />
@@ -65 +73 @@
       <DependentUpon>FunctionView.cs</DependentUpon>
     </Compile>
-    <Compile Include="IfThenElse.cs" />
     <Compile Include="IFunctionVisitor.cs" />
     <Compile Include="LessThan.cs" />
     <Compile Include="Not.cs" />
-    <Compile Include="Or.cs" />
     <Compile Include="Signum.cs" />
     <Compile Include="Logarithm.cs" />