Changeset 2363 for trunk/sources/HeuristicLab.LinearRegression

Timestamp:

09/16/09 13:13:52 (15 years ago)

Author:

gkronber

Message:

Fixed problems with classification algorithms. #746 (CEDMA server is not compatible with new data-modeling algorithms)

Location:

trunk/sources/HeuristicLab.LinearRegression/3.2

Files:

• LinearClassification.cs (modified) (1 diff)
• LinearRegression.cs (modified) (1 diff)
• LinearTimeSeriesPrognosis.cs (modified) (1 diff)

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

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

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

@@ -60 +60 @@
       get {
         IOperator main = GetMainOperator();
-        return main.SubOperators[2];
+        CombinedOperator probInjector = (CombinedOperator)main.SubOperators[2];
+        return probInjector.OperatorGraph.InitialOperator.SubOperators[0];
       }
       set {
         IOperator main = GetMainOperator();
-        main.RemoveSubOperator(2);
-        main.AddSubOperator(value, 2);
+        CombinedOperator probInjector = (CombinedOperator)main.SubOperators[2];
+        probInjector.OperatorGraph.InitialOperator.RemoveSubOperator(0);
+        probInjector.OperatorGraph.InitialOperator.AddSubOperator(value, 0);
       }
     }

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

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