Changeset 18043

Timestamp:

08/11/21 13:05:27 (3 years ago)

Author:

dpiringe

Message:

#3026

• code cleanup

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.OptimizerIntegration/FileManager.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/MenuItems/ImportJsonTemplateMenuItem.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/CompoundControl.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/ConcreteItemsRestrictor.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/NumericRangeControl.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/ValueLookupJsonItemControl.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/AlgorithmConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/BaseConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/BatchRunConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ConstrainedValueParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/EnumTypeConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ExperimentConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/LookupParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/MultiCheckedOperatorConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/StringValueConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ValueLookupParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ValueTypeArrayConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ValueTypeMatrixConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Interfaces/IConcreteRestrictedJsonItem.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Interfaces/IJsonItem.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Interfaces/IResultFormatter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JsonItems/ConcreteRestrictedValueJsonItem.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JsonItems/IntervalRestrictedJsonItem.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JsonItems/UnsupportedJsonItem.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/ResultFormatters/ResultFormatter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/ResultFormatters/StringResultFormatter.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/FileManager.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/MenuItems/ImportJsonTemplateMenuItem.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HeuristicLab.Common;
-using HeuristicLab.MainForm;
+using System.Collections.Generic;
 using HeuristicLab.Optimizer;
 

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

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {

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

@@ -1 +1 @@
 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;
 

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

@@ -1 +1 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.Common;

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

@@ -1 +1 @@
 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;
-using System.Globalization;
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {

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

@@ -1 +1 @@
 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;
 using HeuristicLab.PluginInfrastructure;

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;

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

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

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 

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

@@ -4 +4 @@
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.DataAnalysis;
-using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 

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

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

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

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

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IConcreteRestrictedJsonItem.cs

@@ -1 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace HeuristicLab.JsonInterface {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItem.cs

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

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IResultFormatter.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.JsonInterface {
   public interface IResultFormatter {
+    /// <summary>
+    /// A given priority, higher numbers are prior.
+    /// </summary>
     int Priority { get; }
 
+    /// <summary>
+    /// Checks if the given type can be formatted
+    /// </summary>
+    /// <param name="t"></param>
+    /// <returns></returns>
     bool CanFormatType(Type t);
 
+    /// <summary>
+    /// The format method which formats and object into a string (which can be saved in a JSON file).
+    /// </summary>
+    /// <param name="o"></param>
+    /// <returns></returns>
     string Format(object o);
   }

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

@@ -1 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItems/IntervalRestrictedJsonItem.cs

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

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

@@ -6 +6 @@
 namespace HeuristicLab.JsonInterface {
   public class UnsupportedJsonItem : JsonItem {
-    /*
-    public override string Name {
-      get => throw new NotSupportedException();
-      set => throw new NotSupportedException();
-    }
-
-    public override string Description { // TODO
-      get => throw new NotSupportedException();
-      set => throw new NotSupportedException();
-    }
-
-    public override string Path {
-      get => throw new NotSupportedException();
-    }
-    */
 
     [JsonIgnore]
@@ -27 +12 @@
       protected set => throw new NotSupportedException();
     }
-    /*
-    [JsonIgnore]
-    public override IJsonItem Parent {
-      get => throw new NotSupportedException();
-      set => throw new NotSupportedException();
-    }
-    */
+
     protected override ValidationResult Validate() => ValidationResult.Successful();
   }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultFormatters/ResultFormatter.cs

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

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultFormatters/StringResultFormatter.cs

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