Changeset 17519 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models

Timestamp:

04/27/20 15:53:26 (5 years ago)

Author:

dpiringe

Message:

#3026:

• added error output for failed runner initialization
• reorganised some final view models
• TargetedJsonItemType (in JsonItemVMBase) now automatically returns the type of the defined JsonItem
• code cleanup
• refactored RegressionProblemDataConverter
• added lots of comments
• added new view for StringArrayJsonItem
• added new UI component for concrete restricted items and used it in JsonItemConcreteItemArrayControl and JsonItemValidValuesControl

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models

Files:

• ArrayJsonItem.cs (modified) (1 diff)
• BoolJsonItems.cs (modified) (1 diff)
• ConcreteRestrictedArrayJsonItem.cs (modified) (2 diffs)
• ConcreteRestrictedValueJsonItem.cs (modified) (1 diff)
• DateTimeJsonItem.cs (modified) (1 diff)
• DoubleJsonItems.cs (modified) (1 diff)
• EmptyJsonItem.cs (modified) (1 diff)
• IntJsonItems.cs (modified) (1 diff)
• IntervalRestrictedArrayJsonItem.cs (modified) (1 diff)
• IntervalRestrictedMatrixJsonItem.cs (modified) (1 diff)
• IntervalRestrictedValueJsonItem.cs (modified) (1 diff)
• JsonItem.cs (modified) (3 diffs)
• LookupJsonItem.cs (modified) (1 diff)
• MatrixJsonItem.cs (modified) (1 diff)
• RangedJsonItem.cs (modified) (1 diff)
• ResultJsonItem.cs (modified) (1 diff)
• StringJsonItem.cs (modified) (1 diff)
• UnsupportedJsonItem.cs (modified) (2 diffs)
• ValueJsonItem.cs (modified) (1 diff)
• ValueLookupJsonItem.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ArrayJsonItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/BoolJsonItems.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HeuristicLab.JsonInterface {
+namespace HeuristicLab.JsonInterface {
   public class BoolJsonItem : ValueJsonItem<bool> {
     protected override ValidationResult Validate() => ValidationResult.Successful();

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedArrayJsonItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace HeuristicLab.JsonInterface {
   public abstract class ConcreteRestrictedArrayJsonItem<T> : ArrayJsonItem<T>, IConcreteRestrictedJsonItem<T> {
@@ -12 +8 @@
       bool res = true;
       IList<string> errors = new List<string>();
+      if (ConcreteRestrictedItems == null) return ValidationResult.Successful();
       foreach(var x in Value) {
         bool tmp = false;

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedValueJsonItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.JsonInterface {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DateTimeJsonItem.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DoubleJsonItems.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/EmptyJsonItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HeuristicLab.JsonInterface {
+namespace HeuristicLab.JsonInterface {
   public class EmptyJsonItem : JsonItem {
     protected override ValidationResult Validate() => ValidationResult.Successful();

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntJsonItems.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedArrayJsonItem.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedMatrixJsonItem.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedValueJsonItem.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/JsonItem.cs

@@ -1 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -76 +75 @@
       }
     }
-        
+
     // TODO jsonIgnore dataType?
-
     [JsonIgnore]
-    public virtual IList<IJsonItem> Children { get; protected set; }
+    public virtual IEnumerable<IJsonItem> Children { get; protected set; }
 
     [JsonIgnore]
@@ -104 +102 @@
       if (Children == null)
         Children = new List<IJsonItem>();
-      foreach (var child in childs) {
-        Children.Add(child);
-        child.Parent = this;
+      if(Children is IList<IJsonItem> list) {
+        foreach (var child in childs) {
+          list.Add(child);
+          child.Parent = this;
+        }
       }
     }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/LookupJsonItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/MatrixJsonItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/RangedJsonItem.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.JsonInterface {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ResultJsonItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HeuristicLab.JsonInterface {
+namespace HeuristicLab.JsonInterface {
   public class ResultJsonItem : JsonItem, IResultJsonItem {
     protected override ValidationResult Validate() => ValidationResult.Successful();

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/StringJsonItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HeuristicLab.JsonInterface {
+namespace HeuristicLab.JsonInterface {
   public class StringJsonItem : ConcreteRestrictedValueJsonItem<string> { }
   public class StringArrayJsonItem : ConcreteRestrictedArrayJsonItem<string> { }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/UnsupportedJsonItem.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
@@ -23 +20 @@
 
     [JsonIgnore]
-    public override IList<IJsonItem> Children {
+    public override IEnumerable<IJsonItem> Children {
       get => throw new NotSupportedException();
       protected set => throw new NotSupportedException();

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueJsonItem.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueLookupJsonItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
+using System.Collections.Generic;
 using Newtonsoft.Json.Linq;