Changeset 2199 for branches

Timestamp:

07/28/09 18:32:53 (15 years ago)

Author:

gkronber

Message:

Changed dispatcher to allow all variables as input or target variable. #712

Location:

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• DispatcherBase.cs (modified) (6 diffs)
• Problem.cs (modified) (2 diffs)
• ProblemView.cs (modified) (1 diff)

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/DispatcherBase.cs

@@ -50 +50 @@
       get {
         if (problem != null) {
-          return problem.AllowedTargetVariables.Select(x => problem.Dataset.GetVariableName(x));
+          return Enumerable.Range(0, problem.Dataset.Columns).Select(x => problem.Dataset.GetVariableName(x));
         } else return new string[0];
       }
@@ -58 +58 @@
       get {
         if (problem != null) {
-          return problem.AllowedInputVariables.Select(x => problem.Dataset.GetVariableName(x));
+          return TargetVariables;
         } else return new string[0];
       }
@@ -65 +65 @@
     public DispatcherBase(IModelingDatabase database, Problem problem) {
       this.problem = problem;
+      allowedTargetVariables = new List<int>();
+      activeInputVariables = new Dictionary<int, List<int>>();
       problem.Changed += (sender, args) => {
-        allowedTargetVariables = new List<int>(problem.AllowedTargetVariables);
-        activeInputVariables = new Dictionary<int, List<int>>();
-        foreach (int targetVar in problem.AllowedTargetVariables) {
-          activeInputVariables.Add(targetVar, new List<int>());
-          activeInputVariables[targetVar].AddRange(problem.AllowedInputVariables);
+        lock (locker) {
+          allowedTargetVariables.Clear();
+          activeInputVariables.Clear();
         }
         OnChanged();
@@ -124 +124 @@
         int targetIndex = problem.Dataset.GetVariableIndex(target);
         int inputIndex = problem.Dataset.GetVariableIndex(name);
+        if (!activeInputVariables.ContainsKey(targetIndex)) activeInputVariables[targetIndex] = new List<int>();
         if (!activeInputVariables[targetIndex].Contains(inputIndex)) {
           activeInputVariables[targetIndex].Add(inputIndex);
@@ -134 +135 @@
         int targetIndex = problem.Dataset.GetVariableIndex(target);
         int inputIndex = problem.Dataset.GetVariableIndex(name);
+        if (!activeInputVariables.ContainsKey(targetIndex)) activeInputVariables[targetIndex] = new List<int>();
         while (activeInputVariables[targetIndex].Remove(inputIndex)) { }
       }
@@ -143 +145 @@
 
     internal IEnumerable<string> GetInputVariables(string target) {
-      return activeInputVariables[problem.Dataset.GetVariableIndex(target)]
+      int targetIndex = problem.Dataset.GetVariableIndex(target);
+      if (!activeInputVariables.ContainsKey(targetIndex)) activeInputVariables[targetIndex] = new List<int>();
+      return activeInputVariables[targetIndex]
         .Select(i => problem.Dataset.GetVariableName(i));
     }

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/Problem.cs

@@ -87 +87 @@
     }
 
-    private List<int> allowedInputVariables;
-    public List<int> AllowedInputVariables {
-      get { return allowedInputVariables; }
-    }
+    //private List<int> allowedInputVariables;
+    //public List<int> AllowedInputVariables {
+    //  get { return allowedInputVariables; }
+    //}
 
-    private List<int> allowedTargetVariables;
-    public List<int> AllowedTargetVariables {
-      get { return allowedTargetVariables; }
-    }
+    //private List<int> allowedTargetVariables;
+    //public List<int> AllowedTargetVariables {
+    //  get { return allowedTargetVariables; }
+    //}
 
     private bool autoRegressive;
@@ -123 +123 @@
     public Problem()
       : base() {
-      allowedInputVariables = new List<int>();
-      allowedTargetVariables = new List<int>();
+      //allowedInputVariables = new List<int>();
+      //allowedTargetVariables = new List<int>();
       Dataset = new HeuristicLab.DataAnalysis.Dataset();
     }

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/ProblemView.cs

@@ -102 +102 @@
           problem.TestSamplesStart = parser.TestSamplesStart;
           problem.TestSamplesEnd = parser.TestSamplesEnd;
-          problem.AllowedTargetVariables.Add(parser.TargetVariable);
+          //problem.AllowedTargetVariables.Add(parser.TargetVariable);
           problem.FireChanged();
-          List<int> nonInputVariables = parser.NonInputVariables;
-          for (int i = 0; i < dataset.Columns; i++) {
-            if (!nonInputVariables.Contains(i)) problem.AllowedInputVariables.Add(i);
-          }
+          //List<int> nonInputVariables = parser.NonInputVariables;
+          //for (int i = 0; i < dataset.Columns; i++) {
+          //  if (!nonInputVariables.Contains(i)) problem.AllowedInputVariables.Add(i);
+          //}
           Refresh();
         }