Changeset 17284 for branches

Timestamp:

10/01/19 14:49:33 (5 years ago)

Author:

dpiringe

Message:

#3026: renamed namespace and project from HeuristicLab.Manufacture to HeuristicLab.JsonInterface

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab 3.3.sln (modified) (3 diffs)
• HeuristicLab.JsonInterface (moved) (moved from branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture)
• HeuristicLab.JsonInterface/Converters/BaseConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ConstrainedValueParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/DummyConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/EnumTypeConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/LookupParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/MultiCheckedOperatorConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ParameterBaseConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/StringValueConverter.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/Converters/ValueTypeValueConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/CustomJsonWriter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Extensions/ObjectExtensions.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Extensions/TypeExtensions.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj (copied) (copied from branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/HeuristicLab.Manufacture.csproj) (1 diff)
• HeuristicLab.JsonInterface/HeuristicLab.Manufacture.csproj (deleted)
• HeuristicLab.JsonInterface/Interfaces/IJsonItemConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JCGenerator.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JCInstantiator.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JsonItem.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JsonItemConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Program.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab 3.3.sln

@@ -472 +472 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis.DecisionTrees-3.4", "HeuristicLab.Algorithms.DataAnalysis.DecisionTrees\3.4\HeuristicLab.Algorithms.DataAnalysis.DecisionTrees-3.4.csproj", "{541A53F3-E6A7-402F-91BB-D76041CDD9FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Manufacture", "ParameterTest\HeuristicLab.Manufacture.csproj", "{0E3AAB5E-F152-44E0-A054-4D9A83ECEE08}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heuristiclab.ConfigStarter", "Heuristiclab.ConfigStarter\Heuristiclab.ConfigStarter.csproj", "{E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.JsonInterface", "HeuristicLab.JsonInterface\HeuristicLab.JsonInterface.csproj", "{0E3AAB5E-F152-44E0-A054-4D9A83ECEE08}"
 EndProject
 Global
@@ -2294 +2294 @@
     {541A53F3-E6A7-402F-91BB-D76041CDD9FD}.Release|x86.ActiveCfg = Release|Any CPU
     {541A53F3-E6A7-402F-91BB-D76041CDD9FD}.Release|x86.Build.0 = Release|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|x64.Build.0 = Debug|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|x86.Build.0 = Debug|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|x64.ActiveCfg = Release|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|x64.Build.0 = Release|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|x86.ActiveCfg = Release|Any CPU
+    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|x86.Build.0 = Release|Any CPU
     {0E3AAB5E-F152-44E0-A054-4D9A83ECEE08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {0E3AAB5E-F152-44E0-A054-4D9A83ECEE08}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -2306 +2318 @@
     {0E3AAB5E-F152-44E0-A054-4D9A83ECEE08}.Release|x86.ActiveCfg = Release|Any CPU
     {0E3AAB5E-F152-44E0-A054-4D9A83ECEE08}.Release|x86.Build.0 = Release|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|x64.ActiveCfg = Debug|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|x64.Build.0 = Debug|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|x86.ActiveCfg = Debug|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Debug|x86.Build.0 = Debug|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|Any CPU.Build.0 = Release|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|x64.ActiveCfg = Release|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|x64.Build.0 = Release|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|x86.ActiveCfg = Release|Any CPU
-    {E0FB3F94-8A4D-4F37-8D8F-E757B1E6E99A}.Release|x86.Build.0 = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

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

@@ -7 +7 @@
 using Newtonsoft.Json.Linq;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public abstract class BaseConverter : IJsonItemConverter
   {

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

@@ -6 +6 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class ConstrainedValueParameterConverter : ParameterBaseConverter {
     public override void InjectData(IParameter parameter, JsonItem data) {

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

@@ -6 +6 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class DummyConverter : BaseConverter {
     public override void InjectData(IItem item, JsonItem data) {

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

@@ -7 +7 @@
 using HeuristicLab.Data;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class EnumTypeConverter : BaseConverter {
     public override void InjectData(IItem item, JsonItem data) =>

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

@@ -6 +6 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class LookupParameterConverter : ParameterBaseConverter {
     public override JsonItem ExtractData(IParameter value) {

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

@@ -6 +6 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class MultiCheckedOperatorConverter : ParameterizedItemConverter {
     public override JsonItem ExtractData(IItem value) {

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

@@ -6 +6 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public abstract class ParameterBaseConverter : BaseConverter {
     public override JsonItem ExtractData(IItem value) {

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;JsonItem obj
+using System.Text;
 using System.Threading.Tasks;
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Manufacture
-{
+namespace HeuristicLab.JsonInterface {
   public class ParameterizedItemConverter : BaseConverter {
     public override void InjectData(IItem item, JsonItem data) {

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

@@ -7 +7 @@
 using HeuristicLab.Data;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class StringValueConverter : BaseConverter {
     public override void InjectData(IItem item, JsonItem data) =>

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

@@ -6 +6 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class ValueParameterConverter : ParameterBaseConverter {
 

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

@@ -8 +8 @@
 using Newtonsoft.Json.Linq;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class ValueTypeArrayConverter<ArrayType, T> : BaseConverter
     where ArrayType : ValueTypeArray<T>

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

@@ -8 +8 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class ValueTypeMatrixConverter<MatrixType, T> : BaseConverter
     where MatrixType : ValueTypeMatrix<T> 

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

@@ -7 +7 @@
 using HeuristicLab.Data;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class ValueTypeValueConverter<ValueType, T> : BaseConverter
     where ValueType : ValueTypeValue<T>

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

@@ -3 +3 @@
 using Newtonsoft.Json.Linq;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   internal class CustomJsonWriter : JsonTextWriter {
     private bool isRangeArray = false;

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Extensions/ObjectExtensions.cs

@@ -5 +5 @@
 using System.Threading.Tasks;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public static class ObjectExtensions {
     public static T Cast<T>(this object obj) => (T)obj;

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Extensions/TypeExtensions.cs

@@ -6 +6 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public static class TypeExtensions {
 

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

@@ -7 +7 @@
     <ProjectGuid>{0E3AAB5E-F152-44E0-A054-4D9A83ECEE08}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>HeuristicLab.Manufacture</RootNamespace>
-    <AssemblyName>HeuristicLab.Manufacture</AssemblyName>
+    <RootNamespace>HeuristicLab.JsonInterface</RootNamespace>
+    <AssemblyName>HeuristicLab.JsonInterface</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>

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

@@ -7 +7 @@
 using Newtonsoft.Json.Linq;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public interface IJsonItemConverter {
     /// <summary>

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

@@ -12 +12 @@
 using Newtonsoft.Json.Serialization;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class JCGenerator {
 

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

@@ -12 +12 @@
 using Newtonsoft.Json.Linq;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public class JCInstantiator {
 

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

@@ -8 +8 @@
 using Newtonsoft.Json.Linq;
 
-namespace HeuristicLab.Manufacture {
-  //JsonItem
+namespace HeuristicLab.JsonInterface {
   public class JsonItem {
     private IList<object> range;

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

@@ -7 +7 @@
 using HeuristicLab.Data;
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   public static class JsonItemConverter {
 

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

@@ -27 +27 @@
 
 
-namespace HeuristicLab.Manufacture {
+namespace HeuristicLab.JsonInterface {
   
   public class Program {