Changeset 17560

Timestamp:

05/26/20 09:39:14 (4 years ago)

Author:

dpiringe

Message:

#3026:

• added an extra loop to add empty default results in Runner (to prevent not existing results)
• fixed a bug in JsonItemValidValuesControl, now the dropdown should not reset the default value

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.App/Runner.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/StringValueVM.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs

@@ -48 +48 @@
         arr.Add(obj);
         obj.Add("Run", JToken.FromObject(run.ToString()));
+
+        // add empty values for configured results
+        var emptyToken = JToken.FromObject("");
+        foreach (var cr in configuredResults) {
+          obj.Add(cr, emptyToken);
+        }
+
+        // change empty values with calculated values
+        var formatter = new SymbolicDataAnalysisExpressionMATLABFormatter();
         foreach (var res in run.Results) {
-          if (configuredResults.Contains(res.Key)) {
+          if(obj.ContainsKey(res.Key)) {
             if (res.Value is ISymbolicRegressionSolution solution) {
-              var formatter = new SymbolicDataAnalysisExpressionMATLABFormatter();
-              var x = formatter.Format(solution.Model.SymbolicExpressionTree);
-              obj.Add(res.Key, JToken.FromObject(x));
-            } else
-              obj.Add(res.Key, JToken.FromObject(res.Value.ToString()));
+              var formattedModel = formatter.Format(solution.Model.SymbolicExpressionTree);
+              obj[res.Key] = JToken.FromObject(formattedModel);
+            } else {
+              obj[res.Key] = JToken.FromObject(res.Value.ToString());
+            }
           }
         }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/StringValueVM.cs

@@ -25 +25 @@
         Item.ConcreteRestrictedItems = value;
         //check if value is still in range
-        if (!Range.Any(x => x == Value)) {
+        if (!Range.Contains(Value)) {
           Value = Range.FirstOrDefault();
           if (Range.Count() == 0)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.cs

@@ -13 +13 @@
       VM = vm;
       if (VM.Item.ConcreteRestrictedItems != null) {
+        string tmp = VM.Value;
         concreteItemsRestrictor.OnChecked += AddComboOption;
         concreteItemsRestrictor.OnUnchecked += RemoveComboOption;
         concreteItemsRestrictor.Init(VM.Item.ConcreteRestrictedItems);
+        VM.Value = tmp;
         comboBoxValues.DataBindings.Add("SelectedItem", VM, nameof(StringValueVM.Value));
       } else {
@@ -51 +53 @@
       }
       VM.Range = items;
+
       if (VM.Range.Count() <= 0) {
         comboBoxValues.Enabled = false;

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs

@@ -238 +238 @@
         MaxValue = testPartition.End,
         Minimum = 0,
-        Maximum = Math.Max(testPartition.End, trainingPartition.End)
+        Maximum = int.MaxValue //Math.Max(testPartition.End, trainingPartition.End)
       };
     }
@@ -251 +251 @@
         MaxValue = trainingPartition.End,
         Minimum = 0,
-        Maximum = Math.Max(testPartition.End, trainingPartition.End)
+        Maximum = int.MaxValue //Math.Max(testPartition.End, trainingPartition.End)
       };
     }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs

@@ -65 +65 @@
       // get algorithm root item
       IJsonItem rootItem = Objects.First().Value;
-      
+
+      //TODO validate
+
       // inject configuration
       JsonItemConverter.Inject(optimizer, rootItem);