Changeset 17483 for branches/3026_IntegrationIntoSymSpace

Timestamp:

03/23/20 11:58:38 (4 years ago)

Author:

dpiringe

Message:

#3026:

• added readme JsonInterfaceReadMe.txt
• removed dead code
• fixed a bug in JsonItemConverter -> now the type comparison should work as intended

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface/Converters/ConstrainedValueParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/StringValueConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ValueLookupParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/Converters/ValueRangeConverter.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/Converters/ValueTypeMatrixConverter.cs (modified) (4 diffs)
• HeuristicLab.JsonInterface/Converters/ValueTypeValueConverter.cs (modified) (5 diffs)
• HeuristicLab.JsonInterface/Extensions (deleted)
• HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj (modified) (2 diffs)
• HeuristicLab.JsonInterface/JsonItemConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Models/ValueLookupJsonItem.cs (modified) (2 diffs)
• Heuristiclab.ConfigStarter/Program.cs (modified) (1 diff)
• JsonInterfaceReadMe.txt (added)

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

@@ -21 +21 @@
       if (parameter.ActualValue != null && parameter.ActualValue is IParameterizedItem && cdata.Children != null) {
         foreach(var child in cdata.Children) {
-          if(child.Name == parameter.ActualValue.ItemName) // name kann verändert werden? egal da bei inject der original name vorhanden ist
+          if(child.Name == cdata.Value || child.Path.EndsWith(cdata.Value))
             root.Inject(parameter.ActualValue, child, root);
         }

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

@@ -17 +17 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new StringJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,

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

@@ -22 +22 @@
       IValueLookupParameter param = value as IValueLookupParameter;
 
-      IValueLookupJsonItem item = new ValueLookupJsonItem() {};
+      IValueLookupJsonItem item = new ValueLookupJsonItem();
 
       if (param.Value != null) {
         IJsonItem tmp = root.Extract(param.Value, root);
         tmp.Parent = item;
-        //item.AddChildren(tmp.Children);
         item.ActualValue = tmp;
       }

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

@@ -21 +21 @@
             root.Inject(parameter.ActualValue, data, root);
           else
-            root.Inject(parameter.ActualValue, /*data.Children?.First()*/ data, root);
+            root.Inject(parameter.ActualValue, data, root);
          
       }
@@ -40 +40 @@
           tmp.Description = parameter.Description;
           item = tmp;
-          /*
-          if (tmp.Name == "[OverridableParamName]") {
-            tmp.Name = parameter.Name;
-            tmp.Description = parameter.Description;
-            item = tmp;
-            //JsonItem.Merge(item as JsonItem, tmp as JsonItem);
-          } else
-            item.AddChildren(tmp);
-            */
         }
       }

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

@@ -25 +25 @@
       IntRange range = value as IntRange;
       return new IntRangeJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,
@@ -50 +49 @@
       DoubleRange range = value as DoubleRange;
       return new DoubleRangeJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,

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

@@ -20 +20 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new IntMatrixJsonItem() {
-        Name = "[OverridableParamName]",
+        Name = value.ItemName,
         Description = value.ItemDescription,
         Value = Transform((IntMatrix)value),
@@ -40 +40 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new DoubleMatrixJsonItem() {
-        Name = "[OverridableParamName]",
+        Name = value.ItemName,
         Description = value.ItemDescription,
         Value = Transform((DoubleMatrix)value),
@@ -62 +62 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new DoubleMatrixJsonItem() {
-        Name = "[OverridableParamName]",
+        Name = value.ItemName,
         Description = value.ItemDescription,
         Value = Transform((PercentMatrix)value),
@@ -82 +82 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new BoolMatrixJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,

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

@@ -18 +18 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new IntJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,
@@ -36 +35 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new DoubleJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,
@@ -54 +52 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new DoubleJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,
         Value = ((PercentValue)value).Value,
-        Minimum = double.MinValue,
-        Maximum = double.MaxValue
+        Minimum = 0.0d,
+        Maximum = 1.0d
       };
   }
@@ -72 +69 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new BoolJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,
@@ -88 +84 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new DateTimeJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj

@@ -61 +61 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AdvancedTypeComparer.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Converters\AlgorithmConverter.cs" />
@@ -166 +165 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Extensions\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -93 +93 @@
 
     private bool CompareGenericTypes(Type t1, Type t2) =>
-      (t1.IsGenericType && t1.GetGenericTypeDefinition() == t2) ||
-      (t2.IsGenericType && t2.GetGenericTypeDefinition() == t1);
+      (t1.IsGenericType && t1.GetGenericTypeDefinition() == t2) /*||
+      (t2.IsGenericType && t2.GetGenericTypeDefinition() == t1)*/;
 
     private bool CompareTypes(Type t1, Type t2) =>
-      t1 == t2 || t1.IsAssignableFrom(t2) ||
+      t1 == t2 || /*t1.IsAssignableFrom(t2) ||*/
       t1.GetInterfaces().Any(
         i => i == t2 || CompareGenericTypes(i, t2)

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

@@ -110 +110 @@
         // override default value
         if (Objects.TryGetValue(path, out IJsonItem param)) {
-          // remove fixed template parameter => dont allow to copy them from concrete config
+          // remove fixed template parameter from config => dont allow to copy them from concrete config
           obj.Property(nameof(IIntervalRestrictedJsonItem<int>.Minimum))?.Remove();
           obj.Property(nameof(IIntervalRestrictedJsonItem<int>.Maximum))?.Remove();

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

@@ -9 +9 @@
 namespace HeuristicLab.JsonInterface {
   public class ValueLookupJsonItem : LookupJsonItem, IValueLookupJsonItem {
-    
     public IJsonItem ActualValue { get; set; }
 
@@ -20 +19 @@
       var obj = base.GenerateJObject();
       if(ActualValue != null) {
-        var actualValue = ActualValue.GenerateJObject();
-        obj.Add(nameof(IValueLookupJsonItem.ActualValue), actualValue);
+        obj.Add(nameof(IValueLookupJsonItem.ActualValue), ActualValue.Path);
       }
       return obj;

branches/3026_IntegrationIntoSymSpace/Heuristiclab.ConfigStarter/Program.cs

@@ -24 +24 @@
         var pluginManager = new PluginManager(pluginPath);
         pluginManager.DiscoverAndCheckPlugins();
-        
       } catch(Exception e) {
         Console.WriteLine(e);