Changeset 192

Timestamp:

04/25/08 14:46:58 (16 years ago)

Author:

gkronber

Message:

performance tuning of functions framework by removing the need for calling Activator in StorableBase

Location:

trunk/sources/HeuristicLab.Functions

Files:

• And.cs (modified) (1 diff)
• Constant.cs (modified) (1 diff)
• FunctionTree.cs (modified) (2 diffs)
• IfThenElse.cs (modified) (1 diff)
• Or.cs (modified) (1 diff)
• Variable.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Functions/And.cs

@@ -67 +67 @@
       }
       // all sub-trees evaluated to 1.0 (true) => return 1.0 (true)
-      return 1.0;      
+      return 1.0;
+    }
+
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      AndFunctionTree clone = new AndFunctionTree();
+      clonedObjects.Add(clone.Guid, clone);
+      FillClone(clone, clonedObjects);
+      return clone;
     }
   }

trunk/sources/HeuristicLab.Functions/Constant.cs

@@ -82 +82 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      ConstantFunctionTree clone = (ConstantFunctionTree)base.Clone(clonedObjects);
+      ConstantFunctionTree clone = new ConstantFunctionTree();
+      clonedObjects.Add(clone.Guid, clone);
+      FillClone(clone, clonedObjects);
       clone.UpdateCachedValues();
       return clone;

trunk/sources/HeuristicLab.Functions/FunctionTree.cs

@@ -93 +93 @@
     }
 
+    double[] evaluationResults;
     public virtual double Evaluate(Dataset dataset, int sampleIndex) {
-      double[] evaluationResults = new double[SubTrees.Count];
+      // lazy creation of evaluationResults to unburden the GC
+      if(evaluationResults == null) {
+        evaluationResults = new double[SubTrees.Count];
+      }
       for(int i = 0; i < evaluationResults.Length; i++) {
         evaluationResults[i] = SubTrees[i].Evaluate(dataset, sampleIndex);
@@ -128 +132 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      FunctionTree clone = (FunctionTree)base.Clone(clonedObjects);
+      FunctionTree clone = new FunctionTree();
+      clonedObjects.Add(clone.Guid, clone);
+      FillClone(clone, clonedObjects);
+      return clone;
+    }
+
+    public void FillClone(FunctionTree clone, IDictionary<Guid, object> clonedObjects) {
+      clone.function = function;
+      foreach(IVariable variable in localVariables) {
+        clone.AddVariable((IVariable)variable.Clone(clonedObjects));
+      }
       foreach(IFunctionTree tree in subTrees) {
         clone.AddSubTree((IFunctionTree)tree.Clone(clonedObjects));
       }
-      foreach(IVariable variable in localVariables) {
-        clone.AddVariable((IVariable)variable.Clone(clonedObjects));
-      }
-      clone.function = function;
-      return clone;
     }
 

trunk/sources/HeuristicLab.Functions/IfThenElse.cs

@@ -65 +65 @@
       else return double.NaN;
     }
+
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      IfThenElseFunctionTree clone = new IfThenElseFunctionTree();
+      clonedObjects.Add(clone.Guid, clone);
+      FillClone(clone, clonedObjects);
+      return clone;
+    }
   }
 }

trunk/sources/HeuristicLab.Functions/Or.cs

@@ -66 +66 @@
       return 0.0;
     }
+
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      OrFunctionTree clone = new OrFunctionTree();
+      clonedObjects.Add(clone.Guid, clone);
+      FillClone(clone, clonedObjects);
+      return clone;
+    }
   }
 }

trunk/sources/HeuristicLab.Functions/Variable.cs

@@ -102 +102 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      VariableFunctionTree clone = (VariableFunctionTree)base.Clone(clonedObjects);
+      VariableFunctionTree clone = new VariableFunctionTree();
+      clonedObjects.Add(clone.Guid, clone);
+      FillClone(clone, clonedObjects);
       clone.UpdateCachedValues();
       return clone;