Changeset 2242 for trunk/sources

Timestamp:

08/05/09 13:11:07 (16 years ago)

Author:

gkronber

Message:

Changed variable impact calculation operators to use the actual training sub-set instead of the full training set. #717 (SVM regression engine takes a very long time to finish)

Location:

trunk/sources

Files:

• HeuristicLab.GP.StructureIdentification/3.3/BaseClasses/AlgorithmBase.cs (modified) (1 diff)
• HeuristicLab.LinearRegression/3.2/LinearRegression.cs (modified) (1 diff)
• HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/BaseClasses/AlgorithmBase.cs

@@ -427 +427 @@
       // calculate and set variable impacts
       VariableEvaluationImpactCalculator evaluationImpactCalculator = new VariableEvaluationImpactCalculator();
+      evaluationImpactCalculator.GetVariableInfo("TrainingSamplesStart").ActualName = "ActualTrainingSamplesStart";
+      evaluationImpactCalculator.GetVariableInfo("TrainingSamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       VariableQualityImpactCalculator qualityImpactCalculator = new VariableQualityImpactCalculator();
+      qualityImpactCalculator.GetVariableInfo("TrainingSamplesStart").ActualName = "ActualTrainingSamplesStart";
+      qualityImpactCalculator.GetVariableInfo("TrainingSamplesEnd").ActualName = "ActualTrainingSamplesEnd";
+        
 
       evaluationImpactCalculator.Apply(bestModelScope);

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

@@ -238 +238 @@
 
       HeuristicLab.GP.StructureIdentification.VariableEvaluationImpactCalculator evalImpactCalc = new HeuristicLab.GP.StructureIdentification.VariableEvaluationImpactCalculator();
+      evalImpactCalc.GetVariableInfo("TrainingSamplesStart").ActualName = "ActualTrainingSamplesStart";
+      evalImpactCalc.GetVariableInfo("TrainingSamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       evalImpactCalc.GetVariableInfo("FunctionTree").ActualName = "LinearRegressionModel";
       HeuristicLab.Modeling.VariableQualityImpactCalculator qualImpactCalc = new HeuristicLab.GP.StructureIdentification.VariableQualityImpactCalculator();
+      qualImpactCalc.GetVariableInfo("TrainingSamplesStart").ActualName = "ActualTrainingSamplesStart";
+      qualImpactCalc.GetVariableInfo("TrainingSamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       qualImpactCalc.GetVariableInfo("FunctionTree").ActualName = "LinearRegressionModel";
       seqProc.AddSubOperator(trainingMSE);

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

@@ -404 +404 @@
       SequentialProcessor seqProc = new SequentialProcessor();
       VariableEvaluationImpactCalculator evalImpactCalc = new VariableEvaluationImpactCalculator();
+      evalImpactCalc.GetVariableInfo("TrainingSamplesStart").ActualName = "ActualTrainingSamplesStart";
+      evalImpactCalc.GetVariableInfo("TrainingSamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       evalImpactCalc.GetVariableInfo("SVMModel").ActualName = "Model";
       VariableQualityImpactCalculator qualImpactCalc = new VariableQualityImpactCalculator();
+      qualImpactCalc.GetVariableInfo("TrainingSamplesStart").ActualName = "ActualTrainingSamplesStart";
+      qualImpactCalc.GetVariableInfo("TrainingSamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       qualImpactCalc.GetVariableInfo("SVMModel").ActualName = "Model";