Changeset 2567 for trunk

Timestamp:

12/21/09 16:23:49 (15 years ago)

Author:

gkronber

Message:

Implemented #818 (Additional model meta data field that stores the number of input variables of the model).

Location:

trunk/sources

Files:

• HeuristicLab.GP.StructureIdentification/3.3/Predictor.cs (modified) (2 diffs)
• HeuristicLab.Modeling/3.2/DefaultModelAnalyzerOperators.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Predictor.cs

@@ -41 +41 @@
     private ITreeEvaluator treeEvaluator;
     public ITreeEvaluator TreeEvaluator {
-      get { return (ITreeEvaluator) this.treeEvaluator.Clone(); }
+      get { return (ITreeEvaluator)this.treeEvaluator.Clone(); }
     }
 
@@ -72 +72 @@
       HashSet<string> inputVariables = new HashSet<string>();
       foreach (IFunctionTree ft in FunctionTreeIterator.IteratePrefix(functionTree.FunctionTree)) {
-        if (ft is VariableFunctionTree) {
-          VariableFunctionTree variable = (VariableFunctionTree)ft;
-          inputVariables.Add(variable.VariableName);
+        VariableFunctionTree varFunTree = ft as VariableFunctionTree;
+        if (varFunTree != null) {
+          inputVariables.Add(varFunTree.VariableName);
         }
       }

trunk/sources/HeuristicLab.Modeling/3.2/DefaultModelAnalyzerOperators.cs

@@ -25 +25 @@
 using HeuristicLab.Modeling;
 using HeuristicLab.Data;
+using System.Linq;
 
 namespace HeuristicLab.Modeling {
@@ -59 +60 @@
         model.ExtractResult(modelScope, r);
       }
+      
+      model.SetMetaData("NumberOfInputVariables", model.Predictor.GetInputVariables().Count());
 
       return model;