Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs	(revision 17519)
@@ -16,19 +16,23 @@
   internal static class Runner {
     internal static void Run(string template, string config, string outputFile) {
-      InstantiatorResult instantiatorResult = JsonTemplateInstantiator.Instantiate(template, config);
-      IOptimizer optimizer = instantiatorResult.Optimizer;
-      IEnumerable<IResultJsonItem> configuredResultItem = instantiatorResult.ConfiguredResultItems;
+      try {
+        InstantiatorResult instantiatorResult = JsonTemplateInstantiator.Instantiate(template, config);
+        IOptimizer optimizer = instantiatorResult.Optimizer;
+        IEnumerable<IResultJsonItem> configuredResultItem = instantiatorResult.ConfiguredResultItems;
 
-      optimizer.Runs.Clear();
-      if(optimizer is EngineAlgorithm e)
-        e.Engine = new ParallelEngine.ParallelEngine();
-      
-      Task task = optimizer.StartAsync();
-      while(!task.IsCompleted) {
+        optimizer.Runs.Clear();
+        if (optimizer is EngineAlgorithm e)
+          e.Engine = new ParallelEngine.ParallelEngine();
+
+        Task task = optimizer.StartAsync();
+        while (!task.IsCompleted) {
+          WriteResultsToFile(outputFile, optimizer, configuredResultItem);
+          Thread.Sleep(100);
+        }
+
         WriteResultsToFile(outputFile, optimizer, configuredResultItem);
-        Thread.Sleep(100);
+      } catch (Exception e) {
+        File.WriteAllText(outputFile, e.Message + "\n\n\n\n" + e.StackTrace);
       }
-     
-      WriteResultsToFile(outputFile, optimizer, configuredResultItem);
     }
 
@@ -47,4 +51,8 @@
           if (configuredResults.Contains(res.Key)) {
             if (res.Value is ISymbolicRegressionSolution solution) {
+              /* TEST */
+              var csFormatter = new CSharpSymbolicExpressionTreeStringFormatter();
+              File.WriteAllText(@"C:\Workspace\output\csFormatted.cs", csFormatter.Format(solution.Model.SymbolicExpressionTree));
+              /* END TEST */
               var formatter = new SymbolicDataAnalysisExpressionMATLABFormatter();
               var x = formatter.Format(solution.Model.SymbolicExpressionTree);
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/HeuristicLab.JsonInterface.OptimizerIntegration.csproj
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/HeuristicLab.JsonInterface.OptimizerIntegration.csproj	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/HeuristicLab.JsonInterface.OptimizerIntegration.csproj	(revision 17519)
@@ -108,4 +108,6 @@
     </Compile>
     <Compile Include="ViewModels\ArrayValueVM.cs" />
+    <Compile Include="ViewModels\DoubleVMs.cs" />
+    <Compile Include="ViewModels\IntVMs.cs" />
     <Compile Include="ViewModels\JsonItemVMBase.cs" />
     <Compile Include="ViewModels\LookupJsonItemVM.cs" />
@@ -117,4 +119,10 @@
     <Compile Include="ViewModels\StringValueVM.cs" />
     <Compile Include="ViewModels\ValueLookupJsonItemVM.cs" />
+    <Compile Include="Shared\ConcreteItemsRestrictor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Shared\ConcreteItemsRestrictor.Designer.cs">
+      <DependentUpon>ConcreteItemsRestrictor.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\ExportJsonDialog.cs">
       <SubType>Form</SubType>
@@ -124,4 +132,10 @@
     </Compile>
     <Compile Include="FileManager.cs" />
+    <Compile Include="Views\JsonItemConcreteItemArrayControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\JsonItemConcreteItemArrayControl.Designer.cs">
+      <DependentUpon>JsonItemConcreteItemArrayControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\JsonItemMultiValueControl.cs">
       <SubType>UserControl</SubType>
@@ -224,6 +238,12 @@
       <DependentUpon>NumericRangeControl.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Shared\ConcreteItemsRestrictor.resx">
+      <DependentUpon>ConcreteItemsRestrictor.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Views\ExportJsonDialog.resx">
       <DependentUpon>ExportJsonDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\JsonItemConcreteItemArrayControl.resx">
+      <DependentUpon>JsonItemConcreteItemArrayControl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\JsonItemMultiValueControl.resx">
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/ConcreteItemsRestrictor.Designer.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/ConcreteItemsRestrictor.Designer.cs	(revision 17519)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/ConcreteItemsRestrictor.Designer.cs	(revision 17519)
@@ -0,0 +1,61 @@
+﻿namespace HeuristicLab.JsonInterface.OptimizerIntegration {
+  partial class ConcreteItemsRestrictor {
+    /// <summary> 
+    /// Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary> 
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing) {
+      if (disposing && (components != null)) {
+        components.Dispose();
+      }
+      base.Dispose(disposing);
+    }
+
+    #region Component Designer generated code
+
+    /// <summary> 
+    /// Required method for Designer support - do not modify 
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent() {
+      this.tableOptions = new System.Windows.Forms.TableLayoutPanel();
+      this.SuspendLayout();
+      // 
+      // tableOptions
+      // 
+      this.tableOptions.AutoScroll = true;
+      this.tableOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+      this.tableOptions.ColumnCount = 2;
+      this.tableOptions.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+      this.tableOptions.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+      this.tableOptions.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+      this.tableOptions.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.tableOptions.Location = new System.Drawing.Point(0, 0);
+      this.tableOptions.Name = "tableOptions";
+      this.tableOptions.RowCount = 1;
+      this.tableOptions.RowStyles.Add(new System.Windows.Forms.RowStyle());
+      this.tableOptions.Size = new System.Drawing.Size(500, 200);
+      this.tableOptions.TabIndex = 13;
+      // 
+      // ConcreteItemsRestrictor
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.tableOptions);
+      this.Margin = new System.Windows.Forms.Padding(0);
+      this.Name = "ConcreteItemsRestrictor";
+      this.Size = new System.Drawing.Size(500, 200);
+      this.ResumeLayout(false);
+
+    }
+
+    #endregion
+
+    private System.Windows.Forms.TableLayoutPanel tableOptions;
+  }
+}
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/ConcreteItemsRestrictor.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/ConcreteItemsRestrictor.cs	(revision 17519)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/ConcreteItemsRestrictor.cs	(revision 17519)
@@ -0,0 +1,59 @@
+﻿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace HeuristicLab.JsonInterface.OptimizerIntegration {
+  public partial class ConcreteItemsRestrictor : UserControl {
+
+    public event Action<object> OnChecked;
+    public event Action<object> OnUnchecked;
+
+    public ConcreteItemsRestrictor() {
+      InitializeComponent();
+    }
+
+    public void Init<T>(IEnumerable<T> objs) {
+      if(objs != null) {
+        foreach(var obj in objs) {
+          SetupOption(obj);
+        }
+      }
+    }
+
+    private void SetupOption(object opt) {
+      AddComboOption(opt);
+      TextBox tb = new TextBox();
+      tb.Text = opt.ToString();
+      tb.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+      tb.ReadOnly = true;
+
+      CheckBox checkBox = new CheckBox();
+      checkBox.Checked = true;
+
+      checkBox.CheckStateChanged += (o, args) => {
+        if (checkBox.Checked)
+          AddComboOption(opt);
+        else
+          RemoveComboOption(opt);
+      };
+      tableOptions.Controls.Add(checkBox);
+      tableOptions.Controls.Add(tb);
+    }
+
+    private void AddComboOption(object obj) {
+      OnChecked?.Invoke(obj);
+      tableOptions.Refresh();
+    }
+
+    private void RemoveComboOption(object obj) {
+      OnUnchecked?.Invoke(obj);
+      tableOptions.Refresh();
+    }
+  }
+}
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/ConcreteItemsRestrictor.resx
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/ConcreteItemsRestrictor.resx	(revision 17519)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/ConcreteItemsRestrictor.resx	(revision 17519)
@@ -0,0 +1,120 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/ArrayValueVM.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/ArrayValueVM.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/ArrayValueVM.cs	(revision 17519)
@@ -9,25 +9,11 @@
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
 
-  public class DoubleArrayValueVM : ArrayValueVM<double, DoubleArrayJsonItem> {
-    public override Type TargetedJsonItemType => typeof(DoubleArrayJsonItem);
+  
 
-    protected override double MinTypeValue => double.MinValue;
 
-    protected override double MaxTypeValue => double.MaxValue;
 
-    public override UserControl Control =>
-      new JsonItemDoubleArrayValueControl(this);
-    
-    public override double[] Value {
-      get => Item.Value;
-      set {
-        Item.Value = value;
-        OnPropertyChange(this, nameof(Value));
-      }
-    }
-  }
-
-  public class IntArrayValueVM : ArrayValueVM<int, IntArrayJsonItem> {
-    public override Type TargetedJsonItemType => typeof(IntArrayJsonItem);
+  /*
+  public class StringArrayValueVM : ArrayValueVM<int, IntArrayJsonItem> {
+    public override Type TargetedJsonItemType => typeof(StringArrayJsonItem);
 
     protected override int MinTypeValue => int.MinValue;
@@ -37,5 +23,5 @@
     public override UserControl Control =>
       new JsonItemBaseControl(this, new JsonItemIntArrayValueControl(this));
-    
+
     public override int[] Value {
       get => Item.Value;
@@ -46,4 +32,6 @@
     }
   }
+  */
+
 
   public abstract class ArrayValueVM<T, JsonItemType> : RangedValueBaseVM<T, JsonItemType>, IArrayJsonItemVM
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/DoubleVMs.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/DoubleVMs.cs	(revision 17519)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/DoubleVMs.cs	(revision 17519)
@@ -0,0 +1,62 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace HeuristicLab.JsonInterface.OptimizerIntegration {
+  public class DoubleRangeVM : RangeVM<double, DoubleRangeJsonItem> {
+
+    protected override double MinTypeValue => double.MinValue;
+
+    protected override double MaxTypeValue => double.MaxValue;
+
+    public override UserControl Control =>
+      new JsonItemRangeControl(this);
+  }
+
+  public class DoubleArrayValueVM : ArrayValueVM<double, DoubleArrayJsonItem> {
+
+    protected override double MinTypeValue => double.MinValue;
+
+    protected override double MaxTypeValue => double.MaxValue;
+
+    public override UserControl Control =>
+      new JsonItemDoubleArrayValueControl(this);
+
+    public override double[] Value {
+      get => Item.Value;
+      set {
+        Item.Value = value;
+        OnPropertyChange(this, nameof(Value));
+      }
+    }
+  }
+
+  public class DoubleMatrixValueVM : MatrixValueVM<double, DoubleMatrixJsonItem> {
+    public override UserControl Control =>
+      new JsonItemDoubleMatrixValueControl(this);
+
+    public override double[][] Value {
+      get => Item.Value;
+      set {
+        Item.Value = value;
+        OnPropertyChange(this, nameof(Value));
+      }
+    }
+
+    protected override double MinTypeValue => double.MinValue;
+
+    protected override double MaxTypeValue => double.MaxValue;
+  }
+
+  public class DoubleValueVM : SingleValueVM<double, DoubleJsonItem> {
+
+    protected override double MinTypeValue => double.MinValue;
+    protected override double MaxTypeValue => double.MaxValue;
+
+    public override UserControl Control =>
+       new JsonItemDoubleValueControl(this);
+  }
+}
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/IntVMs.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/IntVMs.cs	(revision 17519)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/IntVMs.cs	(revision 17519)
@@ -0,0 +1,46 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace HeuristicLab.JsonInterface.OptimizerIntegration {
+  public class IntArrayValueVM : ArrayValueVM<int, IntArrayJsonItem> {
+
+    protected override int MinTypeValue => int.MinValue;
+
+    protected override int MaxTypeValue => int.MaxValue;
+
+    public override UserControl Control =>
+      new JsonItemBaseControl(this, new JsonItemIntArrayValueControl(this));
+
+    public override int[] Value {
+      get => Item.Value;
+      set {
+        Item.Value = value;
+        OnPropertyChange(this, nameof(Value));
+      }
+    }
+  }
+
+  public class IntRangeVM : RangeVM<int, IntRangeJsonItem> {
+
+    protected override int MinTypeValue => int.MinValue;
+
+    protected override int MaxTypeValue => int.MaxValue;
+
+    public override UserControl Control =>
+      new JsonItemRangeControl(this);
+  }
+
+  public class IntValueVM : SingleValueVM<int, IntJsonItem> {
+
+    protected override int MinTypeValue => int.MinValue;
+    protected override int MaxTypeValue => int.MaxValue;
+
+    public override UserControl Control =>
+      new JsonItemIntValueControl(this);
+  }
+
+}
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/JsonItemVMBase.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/JsonItemVMBase.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/JsonItemVMBase.cs	(revision 17519)
@@ -9,5 +9,5 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-  public abstract class JsonItemVMBase<JsonItemType> : IJsonItemVM<JsonItemType>
+  public abstract class JsonItemVMBase<JsonItemType> : IJsonItemVM<JsonItemType> //TODO: RENAME, oder vlt JsonItems direkt als VM?
     where JsonItemType : class, IJsonItem 
   {
@@ -58,5 +58,5 @@
     }
 
-    public abstract Type TargetedJsonItemType { get; }
+    public virtual Type TargetedJsonItemType => typeof(JsonItemType);
     public abstract UserControl Control { get; }
 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/LookupJsonItemVM.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/LookupJsonItemVM.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/LookupJsonItemVM.cs	(revision 17519)
@@ -8,5 +8,4 @@
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
   public class LookupJsonItemVM : JsonItemVMBase<LookupJsonItem>, ILookupJsonItemVM {
-    public override Type TargetedJsonItemType => typeof(LookupJsonItem);
 
     public override UserControl Control => new LookupJsonItemControl(this);
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/MatrixValueVM.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/MatrixValueVM.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/MatrixValueVM.cs	(revision 17519)
@@ -9,21 +9,4 @@
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
 
-  public class DoubleMatrixValueVM : MatrixValueVM<double, DoubleMatrixJsonItem> {
-    public override Type TargetedJsonItemType => typeof(DoubleMatrixJsonItem);
-    public override UserControl Control =>
-      new JsonItemDoubleMatrixValueControl(this);
-
-    public override double[][] Value {
-      get => Item.Value;
-      set {
-        Item.Value = value;
-        OnPropertyChange(this, nameof(Value));
-      }
-    }
-
-    protected override double MinTypeValue => double.MinValue;
-
-    protected override double MaxTypeValue => double.MaxValue;
-  }
 
   public abstract class MatrixValueVM<T, JsonItemType> : RangedValueBaseVM<T, JsonItemType>, IMatrixJsonItemVM
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/RangeVM.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/RangeVM.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/RangeVM.cs	(revision 17519)
@@ -8,26 +8,4 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-
-  public class IntRangeVM : RangeVM<int, IntRangeJsonItem> {
-    public override Type TargetedJsonItemType => typeof(IntRangeJsonItem);
-
-    protected override int MinTypeValue => int.MinValue;
-
-    protected override int MaxTypeValue => int.MaxValue;
-
-    public override UserControl Control =>
-      new JsonItemRangeControl(this);
-  }
-
-  public class DoubleRangeVM : RangeVM<double, DoubleRangeJsonItem> {
-    public override Type TargetedJsonItemType => typeof(DoubleRangeJsonItem);
-
-    protected override double MinTypeValue => double.MinValue;
-
-    protected override double MaxTypeValue => double.MaxValue;
-
-    public override UserControl Control =>
-      new JsonItemRangeControl(this);
-  }
 
   public abstract class RangeVM<T, JsonItemType> : RangedValueBaseVM<T, JsonItemType>
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/SingleValueVM.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/SingleValueVM.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/SingleValueVM.cs	(revision 17519)
@@ -8,26 +8,6 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-  public class IntValueVM : SingleValueVM<int, IntJsonItem> {
-    public override Type TargetedJsonItemType => typeof(IntJsonItem);
-
-    protected override int MinTypeValue => int.MinValue;
-    protected override int MaxTypeValue => int.MaxValue;
-
-    public override UserControl Control =>
-      new JsonItemIntValueControl(this);
-  }
-
-  public class DoubleValueVM : SingleValueVM<double, DoubleJsonItem> {
-    public override Type TargetedJsonItemType => typeof(DoubleJsonItem);
-
-    protected override double MinTypeValue => double.MinValue;
-    protected override double MaxTypeValue => double.MaxValue;
-
-    public override UserControl Control =>
-       new JsonItemDoubleValueControl(this);
-  }
 
   public class BoolValueVM : JsonItemVMBase<BoolJsonItem> {
-    public override Type TargetedJsonItemType => typeof(BoolJsonItem);
 
     public bool Value { 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/StringValueVM.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/StringValueVM.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/StringValueVM.cs	(revision 17519)
@@ -9,5 +9,4 @@
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
   public class StringValueVM : JsonItemVMBase<StringJsonItem> {
-    public override Type TargetedJsonItemType => typeof(StringJsonItem);
     public override UserControl Control =>
        new JsonItemValidValuesControl(this);
@@ -37,5 +36,25 @@
       }
     }
+  }
 
+  public class StringArrayVM : JsonItemVMBase<StringArrayJsonItem> {
+    public override UserControl Control =>
+       new JsonItemConcreteItemArrayControl(this);
+
+    public string[] Value {
+      get => Item.Value;
+      set {
+        Item.Value = value;
+        OnPropertyChange(this, nameof(Value));
+      }
+    }
+
+    public IEnumerable<string> Range {
+      get => Item.ConcreteRestrictedItems;
+      set {
+        Item.ConcreteRestrictedItems = value;
+        OnPropertyChange(this, nameof(Range));
+      }
+    }
   }
 }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemConcreteItemArrayControl.Designer.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemConcreteItemArrayControl.Designer.cs	(revision 17519)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemConcreteItemArrayControl.Designer.cs	(revision 17519)
@@ -0,0 +1,122 @@
+﻿namespace HeuristicLab.JsonInterface.OptimizerIntegration {
+  partial class JsonItemConcreteItemArrayControl {
+    /// <summary> 
+    /// Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary> 
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing) {
+      if (disposing && (components != null)) {
+        components.Dispose();
+      }
+      base.Dispose(disposing);
+    }
+
+    #region Component Designer generated code
+
+    /// <summary> 
+    /// Required method for Designer support - do not modify 
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent() {
+      this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+      this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.dataGridView = new System.Windows.Forms.DataGridView();
+      this.groupBox2 = new System.Windows.Forms.GroupBox();
+      this.concreteItemsRestrictor = new HeuristicLab.JsonInterface.OptimizerIntegration.ConcreteItemsRestrictor();
+      this.tableLayoutPanel1.SuspendLayout();
+      this.groupBox1.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+      this.groupBox2.SuspendLayout();
+      this.SuspendLayout();
+      // 
+      // tableLayoutPanel1
+      // 
+      this.tableLayoutPanel1.ColumnCount = 1;
+      this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+      this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+      this.tableLayoutPanel1.Controls.Add(this.groupBox1, 0, 0);
+      this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1);
+      this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+      this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
+      this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+      this.tableLayoutPanel1.RowCount = 2;
+      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+      this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+      this.tableLayoutPanel1.Size = new System.Drawing.Size(682, 350);
+      this.tableLayoutPanel1.TabIndex = 0;
+      // 
+      // groupBox1
+      // 
+      this.groupBox1.Controls.Add(this.dataGridView);
+      this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.groupBox1.Location = new System.Drawing.Point(0, 0);
+      this.groupBox1.Margin = new System.Windows.Forms.Padding(0);
+      this.groupBox1.Name = "groupBox1";
+      this.groupBox1.Size = new System.Drawing.Size(682, 175);
+      this.groupBox1.TabIndex = 0;
+      this.groupBox1.TabStop = false;
+      this.groupBox1.Text = "Value";
+      // 
+      // dataGridView
+      // 
+      this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+      this.dataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.dataGridView.Location = new System.Drawing.Point(3, 16);
+      this.dataGridView.Name = "dataGridView";
+      this.dataGridView.Size = new System.Drawing.Size(676, 156);
+      this.dataGridView.TabIndex = 0;
+      this.dataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellEndEdit);
+      this.dataGridView.RowsRemoved += new System.Windows.Forms.DataGridViewRowsRemovedEventHandler(this.dataGridView_RowsRemoved);
+      // 
+      // groupBox2
+      // 
+      this.groupBox2.Controls.Add(this.concreteItemsRestrictor);
+      this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.groupBox2.Location = new System.Drawing.Point(0, 175);
+      this.groupBox2.Margin = new System.Windows.Forms.Padding(0);
+      this.groupBox2.Name = "groupBox2";
+      this.groupBox2.Size = new System.Drawing.Size(682, 175);
+      this.groupBox2.TabIndex = 1;
+      this.groupBox2.TabStop = false;
+      this.groupBox2.Text = "Range";
+      // 
+      // concreteItemsRestrictor
+      // 
+      this.concreteItemsRestrictor.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.concreteItemsRestrictor.Location = new System.Drawing.Point(3, 16);
+      this.concreteItemsRestrictor.Margin = new System.Windows.Forms.Padding(0);
+      this.concreteItemsRestrictor.Name = "concreteItemsRestrictor";
+      this.concreteItemsRestrictor.Size = new System.Drawing.Size(676, 156);
+      this.concreteItemsRestrictor.TabIndex = 0;
+      // 
+      // JsonItemConcreteItemArrayControl
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.tableLayoutPanel1);
+      this.Margin = new System.Windows.Forms.Padding(0);
+      this.Name = "JsonItemConcreteItemArrayControl";
+      this.Size = new System.Drawing.Size(682, 350);
+      this.tableLayoutPanel1.ResumeLayout(false);
+      this.groupBox1.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+      this.groupBox2.ResumeLayout(false);
+      this.ResumeLayout(false);
+
+    }
+
+    #endregion
+
+    private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+    private System.Windows.Forms.GroupBox groupBox1;
+    private System.Windows.Forms.DataGridView dataGridView;
+    private System.Windows.Forms.GroupBox groupBox2;
+    private ConcreteItemsRestrictor concreteItemsRestrictor;
+  }
+}
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemConcreteItemArrayControl.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemConcreteItemArrayControl.cs	(revision 17519)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemConcreteItemArrayControl.cs	(revision 17519)
@@ -0,0 +1,81 @@
+﻿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace HeuristicLab.JsonInterface.OptimizerIntegration {
+  public partial class JsonItemConcreteItemArrayControl : UserControl {
+    private StringArrayVM VM { get; set; }
+    private DataGridViewComboBoxColumn ComboBox { get; set; }
+    public JsonItemConcreteItemArrayControl(StringArrayVM vm) {
+      InitializeComponent();
+      dataGridView.AllowUserToDeleteRows = true;
+      VM = vm;
+      if (VM.Item.ConcreteRestrictedItems != null) {
+        ComboBox = new DataGridViewComboBoxColumn();
+        dataGridView.Columns.Add(ComboBox);
+        concreteItemsRestrictor.OnChecked += AddComboOption;
+        concreteItemsRestrictor.OnUnchecked += RemoveComboOption;
+        concreteItemsRestrictor.Init(VM.Item.ConcreteRestrictedItems);
+      } else {
+        dataGridView.AllowUserToAddRows = true;
+        dataGridView.Columns.Add(new DataGridViewTextBoxColumn());
+        groupBox2.Visible = false;
+        tableLayoutPanel1.RowStyles[0].SizeType = SizeType.Percent;
+        tableLayoutPanel1.RowStyles[0].Height = 100.0f;
+      }
+      if(VM.Value != null) {
+        foreach (var val in VM.Value) {
+          dataGridView.Rows.Add(val);
+        }
+      }
+    }
+
+    private void AddComboOption(object opt) {
+      ComboBox.Items.Add(opt);
+      IList<string> items = new List<string>();
+      foreach (var i in ComboBox.Items) {
+        items.Add((string)i);
+      }
+      VM.Range = items;
+      dataGridView.AllowUserToAddRows = true;
+    }
+
+    private void RemoveComboOption(object opt) {
+      ComboBox.Items.Remove(opt);
+      IList<string> items = new List<string>();
+      foreach (var i in ComboBox.Items) {
+        items.Add((string)i);
+      }
+      VM.Range = items;
+      
+      if (VM.Range.Count() <= 0) {
+        dataGridView.Rows.Clear();
+        dataGridView.AllowUserToAddRows = false;
+      }
+    }
+
+    private void BuildValue() {
+      IList<string> list = new List<string>();
+      for (int r = 0; r < dataGridView.Rows.Count; ++r) {
+        var value = dataGridView[0, r].Value;
+        if(value != null)
+          list.Add((string)value);
+      }
+      VM.Value = list.ToArray();
+    }
+    
+    private void dataGridView_RowsRemoved(object sender, DataGridViewRowsRemovedEventArgs e) {
+      BuildValue();
+    }
+
+    private void dataGridView_CellEndEdit(object sender, DataGridViewCellEventArgs e) {
+      BuildValue();
+    }
+  }
+}
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemConcreteItemArrayControl.resx
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemConcreteItemArrayControl.resx	(revision 17519)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemConcreteItemArrayControl.resx	(revision 17519)
@@ -0,0 +1,120 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemMultiValueControl.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemMultiValueControl.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemMultiValueControl.cs	(revision 17519)
@@ -80,5 +80,5 @@
       int cols = matrix.Length;
       int rows = matrix.Max(x => x.Length);
-
+      
       Matrix = matrix;
       Columns = cols;
@@ -250,5 +250,4 @@
                                             typeof(T),
                                             System.Globalization.CultureInfo.InvariantCulture);
-      //Save(Matrix[e.ColumnIndex][e.RowIndex], e.ColumnIndex, e.RowIndex);
       Save();
     }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.Designer.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.Designer.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.Designer.cs	(revision 17519)
@@ -25,8 +25,8 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      this.tableOptions = new System.Windows.Forms.TableLayoutPanel();
       this.comboBoxValues = new System.Windows.Forms.ComboBox();
       this.label2 = new System.Windows.Forms.Label();
       this.groupBoxRange = new System.Windows.Forms.GroupBox();
+      this.concreteItemsRestrictor = new HeuristicLab.JsonInterface.OptimizerIntegration.ConcreteItemsRestrictor();
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
       this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@@ -37,20 +37,4 @@
       this.tableLayoutPanel2.SuspendLayout();
       this.SuspendLayout();
-      // 
-      // tableOptions
-      // 
-      this.tableOptions.AutoScroll = true;
-      this.tableOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-      this.tableOptions.ColumnCount = 2;
-      this.tableOptions.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-      this.tableOptions.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-      this.tableOptions.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-      this.tableOptions.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.tableOptions.Location = new System.Drawing.Point(3, 16);
-      this.tableOptions.Name = "tableOptions";
-      this.tableOptions.RowCount = 1;
-      this.tableOptions.RowStyles.Add(new System.Windows.Forms.RowStyle());
-      this.tableOptions.Size = new System.Drawing.Size(494, 217);
-      this.tableOptions.TabIndex = 12;
       // 
       // comboBoxValues
@@ -79,5 +63,5 @@
       // groupBoxRange
       // 
-      this.groupBoxRange.Controls.Add(this.tableOptions);
+      this.groupBoxRange.Controls.Add(this.concreteItemsRestrictor);
       this.groupBoxRange.Dock = System.Windows.Forms.DockStyle.Fill;
       this.groupBoxRange.Location = new System.Drawing.Point(0, 22);
@@ -88,4 +72,13 @@
       this.groupBoxRange.TabStop = false;
       this.groupBoxRange.Text = "Range";
+      // 
+      // concreteItemsRestrictor
+      // 
+      this.concreteItemsRestrictor.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.concreteItemsRestrictor.Location = new System.Drawing.Point(3, 16);
+      this.concreteItemsRestrictor.Margin = new System.Windows.Forms.Padding(0);
+      this.concreteItemsRestrictor.Name = "concreteItemsRestrictor";
+      this.concreteItemsRestrictor.Size = new System.Drawing.Size(494, 217);
+      this.concreteItemsRestrictor.TabIndex = 0;
       // 
       // errorProvider
@@ -122,5 +115,5 @@
       this.tableLayoutPanel2.RowCount = 1;
       this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-      this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+      this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 22F));
       this.tableLayoutPanel2.Size = new System.Drawing.Size(500, 22);
       this.tableLayoutPanel2.TabIndex = 19;
@@ -146,5 +139,4 @@
 
     #endregion
-    private System.Windows.Forms.TableLayoutPanel tableOptions;
     private System.Windows.Forms.ComboBox comboBoxValues;
     private System.Windows.Forms.Label label2;
@@ -153,4 +145,5 @@
     private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
     private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+    private ConcreteItemsRestrictor concreteItemsRestrictor;
   }
 }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/JsonItemValidValuesControl.cs	(revision 17519)
@@ -1,10 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+﻿using System.Collections.Generic;
 using System.Drawing;
-using System.Data;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -18,44 +13,26 @@
       VM = vm;
       if (VM.Item.ConcreteRestrictedItems != null) {
-        foreach (var i in VM.Item.ConcreteRestrictedItems)
-          SetupOption(i);
+        concreteItemsRestrictor.OnChecked += AddComboOption;
+        concreteItemsRestrictor.OnUnchecked += RemoveComboOption;
+        concreteItemsRestrictor.Init(VM.Item.ConcreteRestrictedItems);
         comboBoxValues.DataBindings.Add("SelectedItem", VM, nameof(StringValueVM.Value));
       } else {
-        comboBoxValues.Hide();
         groupBoxRange.Hide();
         TextBox tb = new TextBox();
-        this.Controls.Add(tb);
+        tableLayoutPanel2.Controls.Remove(comboBoxValues);
+        tableLayoutPanel2.Controls.Add(tb, 1, 0);
+
         tb.Location = comboBoxValues.Location;
-        tb.Size = comboBoxValues.Size;
-        tb.Anchor = comboBoxValues.Anchor;
-        tb.Dock = comboBoxValues.Dock;
+        tb.Margin = new Padding(0);
+        tb.Size = new Size(comboBoxValues.Size.Width, 20);
+        tb.Anchor = AnchorStyles.Top | AnchorStyles.Left;
+        tb.Dock = DockStyle.Fill;
+
         tb.DataBindings.Add("Text", VM, nameof(StringValueVM.Value));
         tb.Show();
       }
     }
-    
-    private void SetupOption(string opt) {
-      AddComboOption(opt);
-      TextBox tb = new TextBox();
-      tb.Text = opt;
-      //tb.Size = new Size()
-      tb.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-      //tb.Dock = DockStyle.Right | DockStyle.Left;
-      tb.ReadOnly = true;
 
-      CheckBox checkBox = new CheckBox();
-      checkBox.Checked = true;
-      
-      checkBox.CheckStateChanged += (o, args) => {
-        if (checkBox.Checked)
-          AddComboOption(opt);
-        else
-          RemoveComboOption(opt);
-      };
-      tableOptions.Controls.Add(checkBox);
-      tableOptions.Controls.Add(tb);
-    }
-
-    private void AddComboOption(string opt) {
+    private void AddComboOption(object opt) {
       comboBoxValues.Items.Add(opt);
       IList<string> items = new List<string>();
@@ -63,10 +40,9 @@
         items.Add((string)i);
       }
-      ((StringValueVM)VM).Range = items;
+      VM.Range = items;
       comboBoxValues.Enabled = true;
-      tableOptions.Refresh();
     }
 
-    private void RemoveComboOption(string opt) {
+    private void RemoveComboOption(object opt) {
       comboBoxValues.Items.Remove(opt);
       IList<string> items = new List<string>();
@@ -74,10 +50,9 @@
         items.Add((string)i);
       }
-      ((StringValueVM)VM).Range = items;
-      if (((StringValueVM)VM).Range.Count() <= 0) {
+      VM.Range = items;
+      if (VM.Range.Count() <= 0) {
         comboBoxValues.Enabled = false;
         comboBoxValues.SelectedIndex = -1;
       }
-      tableOptions.Refresh();
     }
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Constants.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Constants.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Constants.cs	(revision 17519)
@@ -1,9 +1,3 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HeuristicLab.JsonInterface {
+﻿namespace HeuristicLab.JsonInterface {
   /// <summary>
   /// Constants for reading/writing templates.
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs	(revision 17519)
@@ -8,38 +8,75 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
   public class RegressionProblemDataConverter : BaseConverter {
+    #region Constants
     private const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
+    private const string TestPartition = "TestPartition";
+    private const string TrainingPartition = "TrainingPartition";
+    private const string TargetVariable = "TargetVariable";
+    private const string AllowedInputVariables = "AllowedInputVariables";
+    private const string Dataset = "Dataset";
+    private const string VariableValues = "variableValues";
+    private const string VariableNames = "variableNames";
+    private const string InputVariables = "InputVariables";
+    private const string Rows = "rows";
+    private const string Value = "value";
+    private const string Parameters = "parameters";
+    private const string CheckedItemList = "CheckedItemList";
+    #endregion
+
     public override int Priority => 20;
+
+    // RegressionProblemData
     public override Type ConvertableType => HEAL.Attic.Mapper.StaticCache.GetType(new Guid("EE612297-B1AF-42D2-BF21-AF9A2D42791C"));
 
     public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
-      var dictTmp = new Dictionary<string, IList>();
-      DoubleMatrixJsonItem matrix = data.Children[0] as DoubleMatrixJsonItem;
-      if(matrix != null) {
-        int c = 0;
-        foreach(var col in matrix.RowNames) {
-          dictTmp.Add(col, new List<double>(matrix.Value[c]));
-          ++c;
-        }
-      }
-
-      dynamic val = (dynamic)item;
-      object dataset = (object)val.Dataset;
-      var rows = dataset.GetType().GetField("rows", flags);
-      rows.SetValue(dataset, matrix.Value[0].Length);
-
-      var variableNames = dataset.GetType().GetField("variableNames", flags);
-      variableNames.SetValue(dataset, matrix.RowNames);
-
-      var dataInfo = dataset.GetType().GetField("variableValues", flags);
-      dataInfo.SetValue(dataset, dictTmp);
-      val.TargetVariable = ((StringJsonItem)data.Children[3]).Value;
-      val.TrainingPartition.Start = ((IntRangeJsonItem)data.Children[2]).MinValue;
-      val.TrainingPartition.End = ((IntRangeJsonItem)data.Children[2]).MaxValue;
-      val.TestPartition.Start = ((IntRangeJsonItem)data.Children[1]).MinValue;
-      val.TestPartition.End = ((IntRangeJsonItem)data.Children[1]).MaxValue;
+
+      dynamic regressionProblemData = (dynamic)item;
+
+      DoubleMatrixJsonItem dataset = null;
+      StringJsonItem targetVariable = null;
+      IntRangeJsonItem testPartition = null;
+      IntRangeJsonItem trainingPartition = null;
+      StringArrayJsonItem allowedInputVariables = null;
+
+
+      // search first for the items (cache them, because the 
+      // order is important for injection)
+      foreach (var child in data.Children) {
+
+        if (child.Path.EndsWith(Dataset))
+          dataset = child as DoubleMatrixJsonItem;
+        else if (child.Path.EndsWith(TargetVariable))
+          targetVariable = child as StringJsonItem;
+        else if (child.Path.EndsWith(TestPartition))
+          testPartition = child as IntRangeJsonItem;
+        else if (child.Path.EndsWith(TrainingPartition))
+          trainingPartition = child as IntRangeJsonItem;
+        else if (child.Path.EndsWith(AllowedInputVariables))
+          allowedInputVariables = child as StringArrayJsonItem;
+
+      }
+
+      // check data
+      if(!dataset.RowNames.Any(x => x == targetVariable.Value)) {
+        throw new Exception($"The value of the target variable ('{targetVariable.Value}') has no matching row name value of the dataset.");
+      }
+
+      foreach(var v in allowedInputVariables.Value) {
+        if(!dataset.RowNames.Any(x => x == v))
+          throw new Exception($"The value of the input variable ('{v}') has no matching row name value of the dataset.");
+      }
+
+      // inject the value of the items
+      SetDataset(regressionProblemData, dataset);
+      SetTargetVariable(regressionProblemData, targetVariable);
+      SetAllowedInputVariables(regressionProblemData, allowedInputVariables, dataset);
+      SetTestPartition(regressionProblemData, testPartition);
+      SetTrainingPartition(regressionProblemData, trainingPartition);
+
     }
 
@@ -50,72 +87,187 @@
       };
 
-      dynamic val = (dynamic)value;
+      IJsonItem ds = GetDataset(value);
+      if(ds != null)
+        item.AddChildren(ds);
+
+      item.AddChildren(GetTestPartition(value));
+      item.AddChildren(GetTrainingPartition(value));
+      item.AddChildren(GetTargetVariable(value));
+      item.AddChildren(GetAllowedInputVariables(value));
+      return item;
+    }
+
+    #region Inject Helper
+    private void SetDataset(dynamic regressionProblemData, DoubleMatrixJsonItem item) {
+      if (item != null) {
+        var dictTmp = new Dictionary<string, IList>();
+        int c = 0;
+        foreach (var col in item.RowNames) {
+          dictTmp.Add(col, new List<double>(item.Value[c]));
+          ++c;
+        }
+
+        object dataset = (object)regressionProblemData.Dataset;
+        var rows = dataset.GetType().GetField(Rows, flags);
+        rows.SetValue(dataset, item.Value[0].Length);
+
+        var variableNames = dataset.GetType().GetField(VariableNames, flags);
+        variableNames.SetValue(dataset, item.RowNames);
+
+        var dataInfo = dataset.GetType().GetField(VariableValues, flags);
+        dataInfo.SetValue(dataset, dictTmp);
+      }
+    }
+
+    private void SetTestPartition(dynamic regressionProblemData, IntRangeJsonItem item) {
+      if (item != null) {
+        regressionProblemData.TestPartition.Start = item.MinValue;
+        regressionProblemData.TestPartition.End = item.MaxValue;
+      }
+    }
+
+    private void SetTrainingPartition(dynamic regressionProblemData, IntRangeJsonItem item) {
+      if (item != null) {
+        regressionProblemData.TrainingPartition.Start = item.MinValue;
+        regressionProblemData.TrainingPartition.End = item.MaxValue;
+      }
+    }
+
+    private void SetTargetVariable(dynamic regressionProblemData, StringJsonItem item) {
+      if (item != null) {
+        var param = (IConstrainedValueParameter<StringValue>)regressionProblemData.TargetVariableParameter;
+        StringValue v = param.Value;
+        FieldInfo fi = v.GetType().GetField(Value, flags);
+        fi.SetValue(v, item.Value);
+      }
+    }
+
+    private void SetAllowedInputVariables(dynamic regressionProblemData, StringArrayJsonItem item, IMatrixJsonItem matrix) {
+      if (item != null && regressionProblemData is IParameterizedItem p) {
+        var regProbDataType = ((ParameterizedNamedItem)regressionProblemData).GetType(); //RegressionProblemData
+
+        var parameterizedNamedItemType = regProbDataType.BaseType.BaseType;
+
+        // reset parameter
+        var parametersInfo = parameterizedNamedItemType.GetField(Parameters, flags);
+        ParameterCollection col = (ParameterCollection)parametersInfo.GetValue((object)regressionProblemData);
+        var oldParam = (FixedValueParameter<ReadOnlyCheckedItemList<StringValue>>)col[InputVariables];
+        var value = oldParam.Value;
+        PropertyInfo listInfo = value.GetType().GetProperty(CheckedItemList, flags);
+        CheckedItemList<StringValue> checkedItemList = (CheckedItemList<StringValue>)listInfo.GetValue(value);
+        checkedItemList.Clear();
+
+        // add list items and set their check state (based on allowed input variables)
+        foreach(var i in matrix.RowNames) {
+          bool isChecked = false;
+          foreach(var x in item.Value)
+            isChecked = isChecked || (x == i);
+          checkedItemList.Add(new StringValue(i).AsReadOnly(), isChecked);
+        }
+      }
+    }
+    #endregion
+
+    #region Extract Helper
+    private IJsonItem GetDataset(IItem item) {
+      dynamic val = (dynamic)item;
       object dataset = (object)val.Dataset;
-      dynamic targetVariable = val.TargetVariable;
-      
-      FieldInfo dataInfo = dataset.GetType().GetField("variableValues", flags);
-      
-      if(dataInfo.GetValue(dataset) is Dictionary<string, IList> dict) {
-        int cols = dict.Count;
-        int rows = 0;
-        IList<string> rowNames = new List<string>();
-        double[][] mat = new double[cols][];
-        int c = 0;
-        foreach(var x in dict) {
-          rows = Math.Max(rows, x.Value.Count);
-          rowNames.Add(x.Key);
-          mat[c] = new double[rows];
-          int r = 0;
-          foreach(var rowValue in x.Value) {
-            // TODO: for integers and bools aswell
-            mat[c][r] = (double)rowValue; 
-            ++r;
+      FieldInfo dataInfo = dataset.GetType().GetField(VariableValues, flags);
+
+      if (dataInfo.GetValue(dataset) is Dictionary<string, IList> dict) {
+        IEnumerator it = dict.Values.First()?.GetEnumerator();
+
+        if(it != null) {
+          if(it.MoveNext() && it.Current is double) {
+            CreateMatrix(dict, out IList<string> rowNames, out double[][] mat);
+            return new DoubleMatrixJsonItem() {
+              Name = Dataset,
+              Value = mat,
+              RowNames = rowNames,
+              Minimum = double.MinValue,
+              Maximum = double.MaxValue
+            };
+          } else if(it.Current is int) {
+            CreateMatrix(dict, out IList<string> rowNames, out int[][] mat);
+            return new IntMatrixJsonItem() {
+              Name = Dataset,
+              Value = mat,
+              RowNames = rowNames,
+              Minimum = int.MinValue,
+              Maximum = int.MaxValue
+            };
+          } else if (it.Current is bool) {
+            CreateMatrix(dict, out IList<string> rowNames, out bool[][] mat);
+            return new BoolMatrixJsonItem() {
+              Name = Dataset,
+              Value = mat,
+              RowNames = rowNames
+            };
           }
-          ++c;
-        }
-        item.AddChildren(new DoubleMatrixJsonItem() {
-          Name = "Dataset",
-          Value = mat,
-          RowNames = rowNames,
-          Minimum = double.MinValue,
-          Maximum = double.MaxValue
-        });
-      }
-
-      var trainingPartition = ((IntRange)val.TrainingPartition);
-      var testPartition = ((IntRange)val.TestPartition);
-
-      item.AddChildren(new IntRangeJsonItem() {
-        Name = "TestPartition",
-        MinValue = testPartition.Start, 
+        }
+      }
+      return null;
+    }
+    
+    private void CreateMatrix<T>(Dictionary<string, IList> dict, out IList<string> rowNames, out T[][] matrix) {
+      int cols = dict.Count, rows = 0, c = 0;
+      rowNames = new List<string>();
+      matrix = new T[cols][];
+      foreach (var x in dict) {
+        rows = Math.Max(rows, x.Value.Count);
+        rowNames.Add(x.Key);
+
+        matrix[c] = new T[rows];
+        int r = 0;
+
+        foreach (var rowValue in x.Value) {
+          matrix[c][r] = (T)rowValue;
+          ++r;
+        }
+        ++c;
+      }
+    }
+
+    private IJsonItem GetTestPartition(IItem item) {
+      dynamic val = (dynamic)item;
+      var trainingPartition = (IntRange)val.TrainingPartition;
+      var testPartition = (IntRange)val.TestPartition;
+      return new IntRangeJsonItem() {
+        Name = TestPartition,
+        MinValue = testPartition.Start,
         MaxValue = testPartition.End,
-        Minimum = 0, 
+        Minimum = 0,
         Maximum = Math.Max(testPartition.End, trainingPartition.End)
-      });
-
-      
-      item.AddChildren(new IntRangeJsonItem() {
-        Name = "TrainingPartition",
+      };
+    }
+
+    private IJsonItem GetTrainingPartition(IItem item) {
+      dynamic val = (dynamic)item;
+      var trainingPartition = (IntRange)val.TrainingPartition;
+      var testPartition = (IntRange)val.TestPartition;
+      return new IntRangeJsonItem() {
+        Name = TrainingPartition,
         MinValue = trainingPartition.Start,
         MaxValue = trainingPartition.End,
         Minimum = 0,
         Maximum = Math.Max(testPartition.End, trainingPartition.End)
-      });
-
-      IEnumerable<StringValue> variables = (IEnumerable<StringValue>)val.InputVariables;
-      item.AddChildren(new StringJsonItem() {
-        Name = "TargetVariable",
-        Value = (string)targetVariable,
-        ConcreteRestrictedItems = variables.Select(x => x.Value)
-      });
-
-      /*
-      item.AddChildren(new StringArrayJsonItem() {
-        Name = "AllowedInputVariables",
-        Value = (string[])val.AllowedInputVariables,
-        Range = variables.Select(x => x.Value)
-      });*/
-      return item;
-    }
+      };
+    }
+      
+
+    private IJsonItem GetTargetVariable(IItem item) =>
+      new StringJsonItem() {
+        Name = TargetVariable,
+        Value = (string)((dynamic)item).TargetVariable,
+        //ConcreteRestrictedItems = variables.Select(x => x.Value)
+      };
+
+    private IJsonItem GetAllowedInputVariables(IItem item) =>
+      new StringArrayJsonItem() {
+        Name = AllowedInputVariables,
+        Value = ((IEnumerable<string>)((dynamic)item).AllowedInputVariables).ToArray(),
+        //ConcreteRestrictedItems = variables.Select(x => x.Value)
+      };
+    #endregion
   }
 }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs	(revision 17519)
@@ -18,5 +18,5 @@
 
       if(parameter.ActualValue != null) {
-          if (data.Children == null || data.Children.Count == 0)
+          if (data.Children == null || data.Children.Count() == 0)
             root.Inject(parameter.ActualValue, data, root);
           else
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IArrayJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IArrayJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IArrayJsonItem.cs	(revision 17519)
@@ -1,10 +1,8 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿namespace HeuristicLab.JsonInterface {
 
-namespace HeuristicLab.JsonInterface {
   public interface IArrayJsonItem : IValueJsonItem {
+    /// <summary>
+    /// Property to define an array item to be resizable.
+    /// </summary>
     bool Resizable { get; set; }
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IConcreteRestrictedJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IConcreteRestrictedJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IConcreteRestrictedJsonItem.cs	(revision 17519)
@@ -1,10 +1,9 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.Collections.Generic;
 
 namespace HeuristicLab.JsonInterface {
   public interface IConcreteRestrictedJsonItem<T> : IJsonItem {
+    /// <summary>
+    /// The item, 
+    /// </summary>
     IEnumerable<T> ConcreteRestrictedItems { get; set; }
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IIntervalRestrictedJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IIntervalRestrictedJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IIntervalRestrictedJsonItem.cs	(revision 17519)
@@ -1,12 +1,18 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.JsonInterface {
+  /// <summary>
+  /// Interface to get a interval restrict JsonItems.
+  /// </summary>
+  /// <typeparam name="T"></typeparam>
   public interface IIntervalRestrictedJsonItem<T> : IJsonItem
     where T : IComparable {
+    /// <summary>
+    /// The allowed minimum of the JsonItem.
+    /// </summary>
     T Minimum { get; set; }
+    /// <summary>
+    /// The allowed maximum of the JsonItem.
+    /// </summary>
     T Maximum { get; set; }
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItem.cs	(revision 17519)
@@ -11,23 +11,48 @@
   [JsonObject]
   public interface IJsonItem : IEnumerable<IJsonItem> {
+    /// <summary>
+    /// Only active items are included in templates.
+    /// </summary>
     bool Active { get; set; }
+
+    /// <summary>
+    /// The name of the JsonItem. Can be changed freely after fixating the path. 
+    /// If the path is not fix, changing the name will have affect of the path.
+    /// </summary>
     string Name { get; set; }
 
+    /// <summary>
+    /// A description for the JsonItem.
+    /// </summary>
     string Description { get; set; }
 
-    string Path {
-      get;
-    }
+    /// <summary>
+    /// The JsonItem path in the related object graph.
+    /// </summary>
+    string Path { get; }
 
+    /// <summary>
+    /// IEnumerable of all sub JsonItems.
+    /// </summary>
     [JsonIgnore]
-    IList<IJsonItem> Children { get; } //TODO: IEnumerable
+    IEnumerable<IJsonItem> Children { get; }
 
+    /// <summary>
+    /// If the JsonItem is a children of an other JsonItem, the parent will be this other JsonItem.
+    /// </summary>
     [JsonIgnore]
     IJsonItem Parent { get; set; }
-        
+
+    /// <summary>
+    /// Returns a validator with integrated caching to validate the JsonItem and all children.
+    /// </summary>
+    /// <returns>JsonItemValidator</returns>    
     IJsonItemValidator GetValidator();
 
+    /// <summary>
+    /// Add sub JsonItems.
+    /// </summary>
+    /// <param name="childs"></param>
     void AddChildren(params IJsonItem[] childs);
-
     void AddChildren(IEnumerable<IJsonItem> childs);
 
@@ -44,5 +69,14 @@
     void LoosenPath();
 
+    /// <summary>
+    /// Method to generate a Newtonsoft JObject, which describes the JsonItem.
+    /// </summary>
+    /// <returns>Newtonsoft JObject</returns>
     JObject GenerateJObject();
+
+    /// <summary>
+    /// To set all necessary JsonItem properties with an given Newtonsoft JObject.
+    /// </summary>
+    /// <param name="jObject">Newtonsoft JObject</param>
     void SetJObject(JObject jObject);
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItemConverter.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItemConverter.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItemConverter.cs	(revision 17519)
@@ -1,9 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
-using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
@@ -25,5 +20,12 @@
     IJsonItem Extract(IItem value, IJsonItemConverter root);
 
+    /// <summary>
+    /// The targeted type for the converter.
+    /// </summary>
     Type ConvertableType { get; }
+
+    /// <summary>
+    /// A given priority, higher numbers are prior.
+    /// </summary>
     int Priority { get; }
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItemValidator.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItemValidator.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItemValidator.cs	(revision 17519)
@@ -1,10 +1,12 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HeuristicLab.JsonInterface {
+﻿namespace HeuristicLab.JsonInterface {
   public interface IJsonItemValidator {
+    /// <summary>
+    /// Validate method to validate a JsonItem.
+    /// </summary>
+    /// <returns>
+    /// The result of the validation process, 
+    /// contains a sucess flag and a list of errors 
+    /// (if validation failed).
+    /// </returns>
     ValidationResult Validate();
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/ILookupJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/ILookupJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/ILookupJsonItem.cs	(revision 17519)
@@ -1,10 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HeuristicLab.JsonInterface {
+﻿namespace HeuristicLab.JsonInterface {
   public interface ILookupJsonItem : IJsonItem {
+    /// <summary>
+    /// The actual name for lookup items.
+    /// </summary>
     string ActualName { get; set; }
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IMatrixJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IMatrixJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IMatrixJsonItem.cs	(revision 17519)
@@ -1,13 +1,21 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.Collections.Generic;
 
 namespace HeuristicLab.JsonInterface {
   public interface IMatrixJsonItem : IValueJsonItem {
+    /// <summary>
+    /// Flag to define resizable rows. 
+    /// </summary>
     bool RowsResizable { get; set; }
+    /// <summary>
+    /// Flag to define resizable columns.
+    /// </summary>
     bool ColumnsResizable { get; set; }
+    /// <summary>
+    /// IEnumerable of row names.
+    /// </summary>
     IEnumerable<string> RowNames { get; set; }
+    /// <summary>
+    /// IEnumerable of column names.
+    /// </summary>
     IEnumerable<string> ColumnNames { get; set; }
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IRangedJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IRangedJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IRangedJsonItem.cs	(revision 17519)
@@ -1,7 +1,3 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.JsonInterface {
@@ -9,5 +5,11 @@
     where T : IComparable 
   {
+    /// <summary>
+    /// The lower bound of an ranged item. 
+    /// </summary>
     T MinValue { get; set; }
+    /// <summary>
+    /// The upper bound of an ranged item.
+    /// </summary>
     T MaxValue { get; set; }
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IResultJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IResultJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IResultJsonItem.cs	(revision 17519)
@@ -1,10 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HeuristicLab.JsonInterface {
-  public interface IResultJsonItem : IJsonItem {
-  }
+﻿namespace HeuristicLab.JsonInterface {
+  /// <summary>
+  /// Empty JsonItem, which indicates a result. For example 'BestQuality'.
+  /// Types of this JsonItems are stored in the result section of the template.
+  /// </summary>
+  public interface IResultJsonItem : IJsonItem { }
 }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IValueJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IValueJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IValueJsonItem.cs	(revision 17519)
@@ -1,10 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HeuristicLab.JsonInterface {
+﻿namespace HeuristicLab.JsonInterface {
   public interface IValueJsonItem : IJsonItem {
+    /// <summary>
+    /// Represent the value of an IItem.
+    /// </summary>
     object Value { get; set; }
   }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IValueLookupJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IValueLookupJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IValueLookupJsonItem.cs	(revision 17519)
@@ -1,11 +1,9 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
+﻿using Newtonsoft.Json;
 
 namespace HeuristicLab.JsonInterface {
   public interface IValueLookupJsonItem : ILookupJsonItem {
+    /// <summary>
+    /// The IJsonItem representation of the actual value of an IValueLookupItem.
+    /// </summary>
     [JsonIgnore]
     IJsonItem ActualValue { get; set; }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs	(revision 17519)
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
+﻿using System.Collections.Generic;
 using HeuristicLab.Optimization;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using HEAL.Attic;
@@ -37,5 +31,5 @@
       #region Serialize HL File
       ProtoBufSerializer serializer = new ProtoBufSerializer();
-      string hlFilePath = fullPath + @"\" + templateName + ".hl";
+      string hlFilePath = fullPath + templateName + ".hl";
       serializer.Serialize(optimizer, hlFilePath);
       #endregion
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverter.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverter.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverter.cs	(revision 17519)
@@ -2,12 +2,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.PluginInfrastructure;
-using HEAL.Attic;
-using System.Collections;
-
 namespace HeuristicLab.JsonInterface {
   /// <summary>
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverterFactory.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverterFactory.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverterFactory.cs	(revision 17519)
@@ -1,7 +1,4 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.PluginInfrastructure;
 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs	(revision 17519)
@@ -1,13 +1,6 @@
-﻿using System;
-using System.Collections;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using HEAL.Attic;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using Newtonsoft.Json.Linq;
@@ -79,5 +72,4 @@
     }
 
-    
     private IEnumerable<IResultJsonItem> CollectResults() {
       IList<IResultJsonItem> res = new List<IResultJsonItem>();
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ArrayJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ArrayJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ArrayJsonItem.cs	(revision 17519)
@@ -1,8 +1,3 @@
-﻿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 {
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/BoolJsonItems.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/BoolJsonItems.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/BoolJsonItems.cs	(revision 17519)
@@ -1,9 +1,3 @@
-﻿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();
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedArrayJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedArrayJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedArrayJsonItem.cs	(revision 17519)
@@ -1,8 +1,4 @@
-﻿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,4 +8,5 @@
       bool res = true;
       IList<string> errors = new List<string>();
+      if (ConcreteRestrictedItems == null) return ValidationResult.Successful();
       foreach(var x in Value) {
         bool tmp = false;
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedValueJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedValueJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedValueJsonItem.cs	(revision 17519)
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.JsonInterface {
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DateTimeJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DateTimeJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DateTimeJsonItem.cs	(revision 17519)
@@ -1,7 +1,3 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DoubleJsonItems.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DoubleJsonItems.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DoubleJsonItems.cs	(revision 17519)
@@ -1,8 +1,3 @@
-﻿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 {
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/EmptyJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/EmptyJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/EmptyJsonItem.cs	(revision 17519)
@@ -1,9 +1,3 @@
-﻿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();
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntJsonItems.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntJsonItems.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntJsonItems.cs	(revision 17519)
@@ -1,8 +1,3 @@
-﻿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 {
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedArrayJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedArrayJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedArrayJsonItem.cs	(revision 17519)
@@ -1,7 +1,4 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedMatrixJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedMatrixJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedMatrixJsonItem.cs	(revision 17519)
@@ -1,7 +1,4 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedValueJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedValueJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntervalRestrictedValueJsonItem.cs	(revision 17519)
@@ -1,7 +1,3 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/JsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/JsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/JsonItem.cs	(revision 17519)
@@ -1,4 +1,3 @@
-﻿using System;
-using System.Collections;
+﻿using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -76,9 +75,8 @@
       }
     }
-        
+
     // TODO jsonIgnore dataType?
-
     [JsonIgnore]
-    public virtual IList<IJsonItem> Children { get; protected set; }
+    public virtual IEnumerable<IJsonItem> Children { get; protected set; }
 
     [JsonIgnore]
@@ -104,7 +102,9 @@
       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;
+        }
       }
     }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/LookupJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/LookupJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/LookupJsonItem.cs	(revision 17519)
@@ -1,8 +1,3 @@
-﻿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 {
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/MatrixJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/MatrixJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/MatrixJsonItem.cs	(revision 17519)
@@ -1,7 +1,3 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/RangedJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/RangedJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/RangedJsonItem.cs	(revision 17519)
@@ -1,7 +1,4 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.JsonInterface {
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ResultJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ResultJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ResultJsonItem.cs	(revision 17519)
@@ -1,9 +1,3 @@
-﻿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();
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/StringJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/StringJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/StringJsonItem.cs	(revision 17519)
@@ -1,9 +1,3 @@
-﻿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> { }
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/UnsupportedJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/UnsupportedJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/UnsupportedJsonItem.cs	(revision 17519)
@@ -1,7 +1,4 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
@@ -23,5 +20,5 @@
 
     [JsonIgnore]
-    public override IList<IJsonItem> Children {
+    public override IEnumerable<IJsonItem> Children {
       get => throw new NotSupportedException();
       protected set => throw new NotSupportedException();
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueJsonItem.cs	(revision 17519)
@@ -1,7 +1,3 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueLookupJsonItem.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueLookupJsonItem.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueLookupJsonItem.cs	(revision 17519)
@@ -1,8 +1,3 @@
-﻿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;
 
Index: /branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs	(revision 17519)
@@ -178,5 +178,5 @@
       Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", new IntRange(testPartitionStart, testPartitionEnd)));
       Parameters.Add(new FixedValueParameter<ReadOnlyItemList<ITransformation>>(TransformationsParameterName, "", transformationsList.AsReadOnly()));
-
+     
       TransformationsParameter.Hidden = true;
 
Index: /branches/3026_IntegrationIntoSymSpace/Heuristiclab.ConfigStarter/Program.cs
===================================================================
--- /branches/3026_IntegrationIntoSymSpace/Heuristiclab.ConfigStarter/Program.cs	(revision 17518)
+++ /branches/3026_IntegrationIntoSymSpace/Heuristiclab.ConfigStarter/Program.cs	(revision 17519)
@@ -30,5 +30,5 @@
       HEAL.Attic.Mapper.StaticCache.UpdateRegisteredTypes();
 
-
+      
       HeuristicLabJsonInterfaceAppApplication app = new HeuristicLabJsonInterfaceAppApplication();
 
@@ -47,11 +47,13 @@
       ActivateJsonItems(root);
 
-      JCGenerator.GenerateTemplate(@"C:\Workspace", "Template", alg, root);
       
+      JCGenerator.GenerateTemplate(@"C:\Workspace\ConfigStarter\", "Template", alg, root);
+      
+
       List<ICommandLineArgument> arguments = new List<ICommandLineArgument>();
       arguments.Add(new StartArgument("JsonInterface"));
-      arguments.Add(new OpenArgument(@"C:\Workspace\Template.json"));
-      arguments.Add(new OpenArgument(@"C:\Workspace\Config.json"));
-      arguments.Add(new StringArgument(@"C:\Workspace\Output.json"));
+      arguments.Add(new OpenArgument(@"C:\Workspace\ConfigStarter\Template.json"));
+      arguments.Add(new OpenArgument(@"C:\Workspace\ConfigStarter\Config.json"));
+      arguments.Add(new StringArgument(@"C:\Workspace\ConfigStarter\Output.json"));
 
       app.Run(arguments.ToArray());
@@ -65,4 +67,12 @@
           i.Active = true;
         }
+        /*
+        if(x.Name == "Dataset" && x is DoubleMatrixJsonItem mat) {
+          mat.Value = new double[5][];
+          mat.RowNames = new string[] { "R1", "R2", "R3" };
+          for(int j = 0; j < 5; ++j) {
+            mat.Value[j] = new double[10];
+          }
+        }*/
       }
     }
