Changeset 12321

Timestamp:

04/16/15 13:57:16 (10 years ago)

Author:

arapeanu

Message:

#2288: Modified CreateTargetVariationExperimentDialog.cs to exclude unchecked inputs from the target variables

Location:

branches/HeuristicLab.VariableInteractionNetworks

Files:

• HeuristicLab.VariableInteractionNetworks.Views/3.3/VariableInteractionNetworkView.cs (modified) (2 diffs)
• HeuristicLab.VariableInteractionNetworks/3.3/CreateTargetVariationExperimentDialog.cs (modified) (2 diffs)

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/VariableInteractionNetworkView.cs

@@ -148 +148 @@
             var variableNames = (from variableImpact in allVariableImpacts
                                  from variableName in variableImpact.RowNames
-                                 select variableName)
-                                              .Distinct().ToArray();
+                                 select variableName).Distinct().ToArray();
 
             List<string> variableNamesList = (from variableName in variableNames
@@ -189 +188 @@
         private DoubleMatrix UpdateAdjacencyMatrixByThreshold(double threshold, DoubleMatrix adjMatrix)
         {
-         //   var updatedMatrix = (DoubleMatrix) adjMatrix.Clone();
             var originalMatrix = (DoubleMatrix)viewHost1.Content;
             var groupRunCollection = Content.GroupBy(x => ((IRegressionProblemData)x.Parameters["ProblemData"]).TargetVariable).ToList();

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/CreateTargetVariationExperimentDialog.cs

@@ -25 +25 @@
         public Experiment Experiment { get; private set; }
         private int repetitions;
-
-
+        
         public CreateTargetVariationExperimentDialog() : this(null) { }
         public CreateTargetVariationExperimentDialog(IAlgorithm alg)
@@ -51 +50 @@
                 throw new InvalidOperationException("Null algorithm!");
 
-            var problem = algorithm.Problem;
-            var regressionProblem = problem as IRegressionProblem;
+            var regressionProblem = algorithm.Problem as IRegressionProblem;
             if (regressionProblem == null)
-                throw new Exception();
+                throw new InvalidOperationException("Null regression problem!!");
 
             var problemData = regressionProblem.ProblemData;
             var variables = problemData.InputVariables.ToList();
+            int checksNo = 0;
 
             for (int i = 0; i < variables.Count; i++)
             {
+                if (!problemData.InputVariables.ItemChecked(problemData.InputVariables[i]))
+                    continue;
+
                 var alg = (IAlgorithm)algorithm.Clone();
                 var pd = ((IRegressionProblem)alg.Problem).ProblemData;
+                checksNo++;
 
                 // set target to false
                 pd.InputVariables.SetItemCheckedState(pd.InputVariables[i], false);
-
+                    
                 pd.TargetVariable = pd.InputVariables[i].Value;
+                    
                 alg.Name += "{Target variable=" + pd.TargetVariable + "}";
 
-                var batchrun = new BatchRun("Batchrun" + i)
+                var batchrun = new BatchRun("Batchrun" + checksNo)
                 {
                     Repetitions = repetitions,