Changeset 1858 for trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs

Timestamp:

05/20/09 11:30:24 (15 years ago)

Author:

gkronber

Message:

Fixed infinite recursion bug in StoreProxy and initialized the ProblemInjector of SVR to an actual ProblemInjector. #635

File:

• trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs (modified) (4 diffs)

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

@@ -47 +47 @@
 
     public IOperator ProblemInjector {
-      get;
-      set;
-    }
+      get {
+        IOperator main = GetMainOperator();
+        return main.SubOperators[1];
+      }
+      set {
+        IOperator main = GetMainOperator();
+        main.RemoveSubOperator(1);
+        main.AddSubOperator(value, 1);
+      }
+    }
+
     public DoubleArrayData NuList {
       get { return GetVariableInjector().GetVariable("NuList").GetValue<DoubleArrayData>(); }
@@ -72 +80 @@
     public SupportVectorRegression() {
       engine = new SequentialEngine.SequentialEngine();
-      ProblemInjector = new EmptyOperator();
       CombinedOperator algo = CreateAlgorithm();
       engine.OperatorGraph.AddOperator(algo);
@@ -92 +99 @@
       SequentialProcessor main = new SequentialProcessor();
       main.AddSubOperator(CreateGlobalInjector());
-      main.AddSubOperator(ProblemInjector);
+      main.AddSubOperator(new ProblemInjector());
 
       SequentialProcessor nuLoop = new SequentialProcessor();
@@ -253 +260 @@
 
     private IOperator GetVariableInjector() {
+      return GetMainOperator().SubOperators[0];
+    }
+
+    private IOperator GetMainOperator() {
       CombinedOperator svm = (CombinedOperator)Engine.OperatorGraph.InitialOperator;
-      return svm.OperatorGraph.InitialOperator.SubOperators[0];
+      return svm.OperatorGraph.InitialOperator;
     }