Changeset 2454 for trunk

Timestamp:

10/29/09 16:07:55 (15 years ago)

Author:

gkronber

Message:

Implemented NodeBasedVariableImpactCalculator. #793

Location:

trunk/sources

Files:

• HeuristicLab.GP.StructureIdentification/3.3/DefaultStructureIdentificationOperators.cs (modified) (2 diffs)
• HeuristicLab.GP.StructureIdentification/3.3/Evaluators/NodeBasedVariableImpactCalculator.cs (added)
• HeuristicLab.GP.StructureIdentification/3.3/HeuristicLab.GP.StructureIdentification-3.3.csproj (modified) (3 diffs)
• HeuristicLab.LinearRegression/3.2/LinearClassification.cs (modified) (1 diff)
• HeuristicLab.LinearRegression/3.2/LinearRegression.cs (modified) (3 diffs)
• HeuristicLab.LinearRegression/3.2/LinearTimeSeriesPrognosis.cs (modified) (1 diff)
• HeuristicLab.Modeling/3.2/DefaultModelAnalyzerOperators.cs (modified) (2 diffs)
• HeuristicLab.Modeling/3.2/ModelingResult.cs (modified) (1 diff)
• HeuristicLab.SupportVectorMachines/3.2/SupportVectorClassification.cs (modified) (1 diff)
• HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs (modified) (3 diffs)
• HeuristicLab.SupportVectorMachines/3.2/SupportVectorTimeSeriesPrognosis.cs (modified) (1 diff)

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

@@ -155 +155 @@
       solutionProc.AddSubOperator(namesExtractor);
       solutionProc.AddSubOperator(predictorBuilder);
+      VariableQualityImpactCalculator qualityImpactCalculator = new VariableQualityImpactCalculator();
+      qualityImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
+      qualityImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
+
+      solutionProc.AddSubOperator(qualityImpactCalculator);
+
+      NodeBasedVariableImpactCalculator nodeImpactCalculator = new NodeBasedVariableImpactCalculator();
+      nodeImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
+      nodeImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
+
+      solutionProc.AddSubOperator(nodeImpactCalculator);
+
       #endregion
 
@@ -165 +177 @@
       model.SetMetaData("TreeSize", gpModel.Size);
       model.SetMetaData("TreeHeight", gpModel.Height);
+      #region variable impacts
+      ItemList qualityImpacts = bestModelScope.GetVariableValue<ItemList>(ModelingResult.VariableQualityImpact.ToString(), false);
+      foreach (ItemList row in qualityImpacts) {
+        string variableName = ((StringData)row[0]).Data;
+        double impact = ((DoubleData)row[1]).Data;
+        model.SetVariableResult(ModelingResult.VariableQualityImpact, variableName, impact);
+        model.AddInputVariable(variableName);
+      }
+      ItemList nodeImpacts = bestModelScope.GetVariableValue<ItemList>(ModelingResult.VariableNodeImpact.ToString(), false);
+      foreach (ItemList row in nodeImpacts) {
+        string variableName = ((StringData)row[0]).Data;
+        double impact = ((DoubleData)row[1]).Data;
+        model.SetVariableResult(ModelingResult.VariableNodeImpact, variableName, impact);
+        model.AddInputVariable(variableName);
+      }
+      #endregion
+
     }
   }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/HeuristicLab.GP.StructureIdentification-3.3.csproj

@@ -36 +36 @@
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -48 +48 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
@@ -85 +86 @@
     <Compile Include="BaseClasses\TreeEvaluatorBase.cs" />
     <Compile Include="DefaultStructureIdentificationOperators.cs" />
+    <Compile Include="Evaluators\NodeBasedVariableImpactCalculator.cs" />
     <Compile Include="HL3TreeEvaluatorInjector.cs" />
     <Compile Include="HL2TreeEvaluatorInjector.cs" />

trunk/sources/HeuristicLab.LinearRegression/3.2/LinearClassification.cs

@@ -54 +54 @@
     }
 
-    protected override IAnalyzerModel CreateLRModel(IScope bestModelScope) {
-      var model = new AnalyzerModel();
+    protected override void CreateSpecificLRModel(IScope bestModelScope, IAnalyzerModel model) {
       DefaultClassificationOperators.PopulateAnalyzerModel(bestModelScope, model);
-      return model;
     }
   }

trunk/sources/HeuristicLab.LinearRegression/3.2/LinearRegression.cs

@@ -215 +215 @@
       seq.AddSubOperator(namesExtractor);
       seq.AddSubOperator(predictorBuilder);
+      VariableQualityImpactCalculator qualityImpactCalculator = new VariableQualityImpactCalculator();
+      qualityImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
+      qualityImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+
+      seq.AddSubOperator(qualityImpactCalculator);
       #endregion
 
       seq.AddSubOperator(CreateModelAnalyzerOperator());
+
+
+
 
       op.OperatorGraph.AddOperator(seq);
@@ -230 +238 @@
     protected virtual IAnalyzerModel CreateLRModel(IScope bestModelScope) {
       var model = new AnalyzerModel();
+      CreateSpecificLRModel(bestModelScope, model);
+      #region variable impacts
+      ItemList qualityImpacts = bestModelScope.GetVariableValue<ItemList>(ModelingResult.VariableQualityImpact.ToString(), false);
+      foreach (ItemList row in qualityImpacts) {
+        string variableName = ((StringData)row[0]).Data;
+        double impact = ((DoubleData)row[1]).Data;
+        model.SetVariableResult(ModelingResult.VariableQualityImpact, variableName, impact);
+        model.AddInputVariable(variableName);
+      }
+      #endregion
+      return model;
+    }
+
+    protected virtual void CreateSpecificLRModel(IScope bestModelScope, IAnalyzerModel model) {
       DefaultRegressionOperators.PopulateAnalyzerModel(bestModelScope, model);
-      return model;
     }
 
@@ -257 +278 @@
     #region persistence
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      LinearRegression clone = (LinearRegression) base.Clone(clonedObjects);
+      LinearRegression clone = (LinearRegression)base.Clone(clonedObjects);
       clone.engine = (IEngine)Auxiliary.Clone(Engine, clonedObjects);
       return clone;

trunk/sources/HeuristicLab.LinearRegression/3.2/LinearTimeSeriesPrognosis.cs

@@ -73 +73 @@
     }
 
-    protected override IAnalyzerModel CreateLRModel(IScope bestModelScope) {
-      var model = new AnalyzerModel();
+    protected override void CreateSpecificLRModel(IScope bestModelScope, IAnalyzerModel model) {
       DefaultTimeSeriesOperators.PopulateAnalyzerModel(bestModelScope, model);
-      return model;
     }
   }

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

@@ -37 +37 @@
       }
 
-      #region variable impacts
-      VariableEvaluationImpactCalculator evaluationImpactCalculator = new VariableEvaluationImpactCalculator();
-      evaluationImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-      evaluationImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
-      VariableQualityImpactCalculator qualityImpactCalculator = new VariableQualityImpactCalculator();
-      qualityImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-      qualityImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
-
-      seq.AddSubOperator(evaluationImpactCalculator);
-      seq.AddSubOperator(qualityImpactCalculator);
-      #endregion
-
       op.OperatorGraph.AddOperator(seq);
       op.OperatorGraph.InitialOperator = seq;
@@ -72 +60 @@
       }
 
-      ItemList evaluationImpacts = modelScope.GetVariableValue<ItemList>(ModelingResult.VariableEvaluationImpact.ToString(), false);
-      ItemList qualityImpacts = modelScope.GetVariableValue<ItemList>(ModelingResult.VariableQualityImpact.ToString(), false);
-      foreach (ItemList row in evaluationImpacts) {
-        string variableName = ((StringData)row[0]).Data;
-        double impact = ((DoubleData)row[1]).Data;
-        model.SetVariableResult(ModelingResult.VariableEvaluationImpact, variableName, impact);
-        model.AddInputVariable(variableName);
-      }
-      foreach (ItemList row in qualityImpacts) {
-        string variableName = ((StringData)row[0]).Data;
-        double impact = ((DoubleData)row[1]).Data;
-        model.SetVariableResult(ModelingResult.VariableQualityImpact, variableName, impact);
-        model.AddInputVariable(variableName);
-      }
-
       return model;
     }

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

@@ -76 +76 @@
 
     VariableQualityImpact,
-    VariableEvaluationImpact
+    VariableEvaluationImpact,
+    VariableNodeImpact
   }
 }

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorClassification.cs

@@ -54 +54 @@
 
 
-    protected override IAnalyzerModel CreateSVMModel(IScope bestModelScope) {
-      IAnalyzerModel model = new AnalyzerModel();
-      model.SetMetaData("Cost", bestModelScope.GetVariableValue<DoubleData>("Cost", false).Data);
-      model.SetMetaData("Nu", bestModelScope.GetVariableValue<DoubleData>("Nu", false).Data);
+    protected override void CreateSpecificSVMModel(IScope bestModelScope, IAnalyzerModel model) {
       DefaultClassificationOperators.PopulateAnalyzerModel(bestModelScope, model);
-      return model;
     }
   }

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs

@@ -453 +453 @@
       seqProc.AddSubOperator(CreateEvaluator("Training"));
       seqProc.AddSubOperator(predictorBuilder);
+
+      #region variable impacts
+      VariableQualityImpactCalculator qualityImpactCalculator = new VariableQualityImpactCalculator();
+      qualityImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
+      qualityImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
+
+      seqProc.AddSubOperator(qualityImpactCalculator);
+      #endregion
+
+
       seqProc.AddSubOperator(CreateModelAnalyzerOperator());
 
@@ -470 +480 @@
       model.SetMetaData("Cost", bestModelScope.GetVariableValue<DoubleData>("Cost", false).Data);
       model.SetMetaData("Nu", bestModelScope.GetVariableValue<DoubleData>("Nu", false).Data);
+      #region variable impacts
+      ItemList qualityImpacts = bestModelScope.GetVariableValue<ItemList>(ModelingResult.VariableQualityImpact.ToString(), false);
+      foreach (ItemList row in qualityImpacts) {
+        string variableName = ((StringData)row[0]).Data;
+        double impact = ((DoubleData)row[1]).Data;
+        model.SetVariableResult(ModelingResult.VariableQualityImpact, variableName, impact);
+        model.AddInputVariable(variableName);
+      }
+      #endregion
+
+      CreateSpecificSVMModel(bestModelScope, model);
+
+      return model;
+    }
+
+    protected virtual void CreateSpecificSVMModel(IScope bestModelScope, IAnalyzerModel model) {
       DefaultRegressionOperators.PopulateAnalyzerModel(bestModelScope, model);
-
-      return model;
     }
 
@@ -498 +522 @@
     #region persistence
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      SupportVectorRegression clone = (SupportVectorRegression) base.Clone(clonedObjects);
+      SupportVectorRegression clone = (SupportVectorRegression)base.Clone(clonedObjects);
       clone.engine = (IEngine)Auxiliary.Clone(Engine, clonedObjects);
       return clone;

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorTimeSeriesPrognosis.cs

@@ -72 +72 @@
     }
 
-    protected override IAnalyzerModel CreateSVMModel(IScope bestModelScope) {
-      var model = new AnalyzerModel();
-      model.SetMetaData("Cost", bestModelScope.GetVariableValue<DoubleData>("Cost", false).Data);
-      model.SetMetaData("Nu", bestModelScope.GetVariableValue<DoubleData>("Nu", false).Data);
+    protected override void CreateSpecificSVMModel(IScope bestModelScope, IAnalyzerModel model) {
       DefaultTimeSeriesOperators.PopulateAnalyzerModel(bestModelScope, model);
-      return model;
     }
   }