Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/10/19 17:39:38 (5 years ago)
Author:
gkronber
Message:

#2994: merged r17007:17118 from trunk to branch

Location:
branches/2994-AutoDiffForIntervals
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • branches/2994-AutoDiffForIntervals

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/CollectObjectGraphTest.cs

    r16565 r17120  
    2525using System.Linq;
    2626using System.Threading.Tasks;
     27using HEAL.Attic;
    2728using HeuristicLab.Algorithms.GeneticAlgorithm;
    2829using HeuristicLab.Common;
    2930using HeuristicLab.Optimization;
    30 using HeuristicLab.Persistence.Default.Xml;
    3131using HeuristicLab.Problems.TestFunctions;
    3232using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3535  [TestClass]
    3636  public class CollectObjectGraphTest {
     37    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3738
    3839    private TestContext testContextInstance;
    … …  
    4849    [TestProperty("Time", "medium")]
    4950    public void TestObjectGraphTraversal() {
    50       GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize(@"Test Resources\GA_SymbReg.hl");
     51      GeneticAlgorithm ga = (GeneticAlgorithm)serializer.Deserialize(@"Test Resources\GA_SymbReg.hl");
    5152      var objects = ga.GetObjectGraphObjects().ToList();
    5253
    … …  
    6061    [TestProperty("Time", "medium")]
    6162    public void CollectGASample() {
    62       GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize(@"Test Resources\GA_SymbReg.hl");
     63      GeneticAlgorithm ga = (GeneticAlgorithm)serializer.Deserialize(@"Test Resources\GA_SymbReg.hl");
    6364
    6465      Stopwatch watch = new Stopwatch();

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

    r16565 r17120  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    2728using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2829using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.Xml;
    3030using HeuristicLab.PluginInfrastructure;
    3131using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3434  [TestClass]
    3535  public class DeepCloneableCloningTest {
     36    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     37
    3638    private TestContext testContextInstance;
    3739    public TestContext TestContext {
    … …  
    6668    [TestProperty("Time", "long")]
    6769    public void TestCloningFinishedExperiment() {
    68       Experiment experiment = (Experiment)XmlParser.Deserialize(@"Test Resources\SamplesExperimentFinished.hl");
     70      Experiment experiment = (Experiment)serializer.Deserialize(@"Test Resources\SamplesExperimentFinished.hl");
    6971
    7072      Experiment clone = (Experiment)experiment.Clone(new Cloner());

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/GeneticAlgorithmTest.cs

    r16565 r17120  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Algorithms.GeneticAlgorithm;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.Xml;
    2727using Microsoft.VisualStudio.TestTools.UnitTesting;
    2828
    … …  
    3030  [TestClass]
    3131  public class GeneticAlgorithmTest {
     32    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3233    public GeneticAlgorithmTest() { }
    3334
    … …  
    4546    public void GeneticAlgorithmPerformanceTest() {
    4647      ex = null;
    47       GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize(@"Test Resources\GA_TSP.hl");
     48      GeneticAlgorithm ga = (GeneticAlgorithm)serializer.Deserialize(@"Test Resources\GA_TSP.hl");
    4849      ga.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(ga_ExceptionOccurred);
    4950      ga.SetSeedRandomly.Value = false;

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/AlpsSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.ALPS;
    2526using HeuristicLab.Encodings.PermutationEncoding;
    2627using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.Xml;
    2828using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2929using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
    … …  
    4040    private const string SymRegSampleFileName = "ALPSGP_SymReg";
    4141
     42    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     43
    4244    [TestMethod]
    4345    [TestCategory("Samples.Create")]
    … …  
    4648      var alpsGa = CreateAlpsGaTspSample();
    4749      string path = Path.Combine(SamplesUtils.SamplesDirectory, TspSampleFileName + SamplesUtils.SampleFileExtension);
    48       XmlGenerator.Serialize(alpsGa, path);
     50      serializer.Serialize(alpsGa, path);
    4951    }
    5052
    … …  
    5557      var alpsGa = CreateAlpsGaSymRegSample();
    5658      string path = Path.Combine(SamplesUtils.SamplesDirectory, SymRegSampleFileName + SamplesUtils.SampleFileExtension);
    57       XmlGenerator.Serialize(alpsGa, path);
     59      serializer.Serialize(alpsGa, path);
    5860    }
    5961

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/EsGriewankSampleTest.cs

    r16565 r17120  
    2121
    2222using System.IO;
     23using HEAL.Attic;
    2324using HeuristicLab.Algorithms.EvolutionStrategy;
    2425using HeuristicLab.Data;
    2526using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.Xml;
    2727using HeuristicLab.Problems.TestFunctions;
    2828using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3333    private const string SampleFileName = "ES_Griewank";
    3434
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     36
    3537    [TestMethod]
    3638    [TestCategory("Samples.Create")]
    … …  
    3941      var es = CreateEsGriewankSample();
    4042      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    41       XmlGenerator.Serialize(es, path);
     43      serializer.Serialize(es, path);
    4244    }
    4345

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GABppSampleTest.cs

    r16565 r17120  
    2121
    2222using System.IO;
    23 using System.Linq;
     23using HEAL.Attic;
    2424using HeuristicLab.Algorithms.GeneticAlgorithm;
    2525using HeuristicLab.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.Xml;
    2726using HeuristicLab.Problems.BinPacking3D;
    2827using HeuristicLab.Selection;
    … …  
    3433    private const string SampleFileName = "GA_BPP";
    3534
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     36
    3637    [TestMethod]
    3738    [TestCategory("Samples.Create")]
    … …  
    4041      var ga = CreateGaBppSample();
    4142      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    42       XmlGenerator.Serialize(ga, path);
     43      serializer.Serialize(ga, path);
    4344    }
    4445

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GAGroupingProblemSampleTest.cs

    r16565 r17120  
    2121
    2222using System.IO;
     23using HEAL.Attic;
    2324using HeuristicLab.Algorithms.GeneticAlgorithm;
    2425using HeuristicLab.Encodings.LinearLinkageEncoding;
    25 using HeuristicLab.Persistence.Default.Xml;
    2626using HeuristicLab.Problems.Programmable;
    2727using HeuristicLab.Selection;
    … …  
    3232  public class GAGroupingProblemSampleTest {
    3333    private const string SampleFileName = "GA_Grouping";
     34
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     36
    3437    #region Code
    3538    private const string ProblemCode = @"
    … …  
    9699      var ga = CreateGaGroupingProblemSample();
    97100      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    98       XmlGenerator.Serialize(ga, path);
     101      serializer.Serialize(ga, path);
    99102    }
    100103

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GATspSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.GeneticAlgorithm;
    2526using HeuristicLab.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.Xml;
    2727using HeuristicLab.Problems.Instances.TSPLIB;
    2828using HeuristicLab.Problems.TravelingSalesman;
    … …  
    3535    private const string SampleFileName = "GA_TSP";
    3636
     37    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     38
    3739    [TestMethod]
    3840    [TestCategory("Samples.Create")]
    … …  
    4143      var ga = CreateGaTspSample();
    4244      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    43       XmlGenerator.Serialize(ga, path);
     45      serializer.Serialize(ga, path);
    4446    }
    4547

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GAVrpSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.GeneticAlgorithm;
    25 using HeuristicLab.Persistence.Default.Xml;
    2626using HeuristicLab.Problems.Instances;
    2727using HeuristicLab.Problems.Instances.VehicleRouting;
    … …  
    3838    private const string SampleFileName = "GA_VRP";
    3939
     40    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     41
    4042    [TestMethod]
    4143    [TestCategory("Samples.Create")]
    … …  
    4446      var ga = CreateGaVrpSample();
    4547      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    46       XmlGenerator.Serialize(ga, path);
     48      serializer.Serialize(ga, path);
    4749    }
    4850

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPArtificialAntSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.GeneticAlgorithm;
    2526using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.Xml;
    2727using HeuristicLab.Problems.GeneticProgramming.ArtificialAnt;
    2828using HeuristicLab.Selection;
    … …  
    3434    private const string SampleFileName = "SGP_SantaFe";
    3535
     36    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     37
    3638    [TestMethod]
    3739    [TestCategory("Samples.Create")]
    … …  
    4042      var ga = CreateGpArtificialAntSample();
    4143      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    42       XmlGenerator.Serialize(ga, path);
     44      serializer.Serialize(ga, path);
    4345    }
    4446

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPMultiplexerSampleTest.cs

    r16565 r17120  
    2121
    2222using System.IO;
     23using HEAL.Attic;
    2324using HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm;
    2425using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.Xml;
    2626using HeuristicLab.Selection;
    2727using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3232    private const string SampleFileName = "GP_Multiplexer";
    3333
     34    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     35
    3436    [TestMethod]
    3537    [TestCategory("Samples.Create")]
    … …  
    3840      var ga = CreateGpMultiplexerSample();
    3941      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    40       XmlGenerator.Serialize(ga, path);
     42      serializer.Serialize(ga, path);
    4143    }
    4244    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPRobocodeSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.GeneticAlgorithm;
    2526using HeuristicLab.Data;
    2627using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.Xml;
    2828using HeuristicLab.Problems.GeneticProgramming.Robocode;
    2929using HeuristicLab.Selection;
    … …  
    3535    private const string SampleFileName = "SGP_Robocode";
    3636
     37    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     38
    3739    [TestMethod]
    3840    [TestCategory("Samples.Create")]
    … …  
    4143      var ga = CreateGpRobocodeSample();
    4244      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    43       XmlGenerator.Serialize(ga, path);
     45      serializer.Serialize(ga, path);
    4446    }
    4547

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicClassificationSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.GeneticAlgorithm;
    2526using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.Xml;
    2727using HeuristicLab.Problems.DataAnalysis;
    2828using HeuristicLab.Problems.DataAnalysis.Symbolic;
    … …  
    3737    private const string SampleFileName = "SGP_SymbClass";
    3838
     39    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     40
    3941    [TestMethod]
    4042    [TestCategory("Samples.Create")]
    … …  
    4345      var ga = CreateGpSymbolicClassificationSample();
    4446      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    45       XmlGenerator.Serialize(ga, path);
     47      serializer .Serialize(ga, path);
    4648    }
    4749

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.GeneticAlgorithm;
    2526using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.Xml;
    2727using HeuristicLab.Problems.DataAnalysis;
    2828using HeuristicLab.Problems.DataAnalysis.Symbolic;
    … …  
    3737    private const string SampleFileName = "SGP_SymbReg";
    3838
     39    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     40
    3941    [TestMethod]
    4042    [TestCategory("Samples.Create")]
    … …  
    4345      var ga = CreateGpSymbolicRegressionSample();
    4446      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    45       XmlGenerator.Serialize(ga, path);
     47      serializer.Serialize(ga, path);
    4648    }
    4749    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleWithOSTest.cs

    r16739 r17120  
    2424using System.IO;
    2525using System.Linq;
     26using HEAL.Attic;
    2627using HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm;
    2728using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.Xml;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030using HeuristicLab.Problems.DataAnalysis.Symbolic;
    … …  
    4040    private const int seed = 12345;
    4141
     42    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     43
    4244    [TestMethod]
    4345    [TestCategory("Samples.Create")]
    … …  
    4648      var osga = CreateGpSymbolicRegressionSample();
    4749      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    48       XmlGenerator.Serialize(osga, path);
     50      serializer.Serialize(osga, path);
    4951    }
    5052    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPTimeSeriesSampleTest.cs

    r16565 r17120  
    2121
    2222using System.IO;
     23using HEAL.Attic;
    2324using HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm;
    2425using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.Xml;
    2626using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2727using HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis;
    … …  
    3434    private const string SampleFileName = "OSGP_TimeSeries";
    3535
     36    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     37
    3638    [TestMethod]
    3739    [TestCategory("Samples.Create")]
    … …  
    4042      var ga = CreateGpTimeSeriesSample();
    4143      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    42       XmlGenerator.Serialize(ga, path);
     44      serializer.Serialize(ga, path);
    4345    }
    4446    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GaussianProcessRegressionSampleTest.cs

    r16739 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.DataAnalysis;
    25 using HeuristicLab.Persistence.Default.Xml;
    2626using HeuristicLab.Problems.DataAnalysis;
    2727using HeuristicLab.Problems.Instances.DataAnalysis;
    … …  
    3333    private const string SampleFileName = "GPR";
    3434
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     36
    3537    [TestMethod]
    3638    [TestCategory("Samples.Create")]
    … …  
    3941      var gpr = CreateGaussianProcessRegressionSample();
    4042      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    41       XmlGenerator.Serialize(gpr, path);
     43      serializer.Serialize(gpr, path);
    4244    }
    4345

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GeSymbolicRegressionSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm;
    25 using HeuristicLab.Persistence.Default.Xml;
    2626using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2727using HeuristicLab.Problems.Instances.DataAnalysis;
    … …  
    3232  [TestClass]
    3333  public class GeSymbolicRegressionSampleTest {
     34
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     36
    3437    #region artificial ant
    3538    private const string GeArtificialAntSampleFileName = "GE_ArtificialAnt";
    … …  
    4144      var geaa = CreateGeArtificialAntSample();
    4245      string path = Path.Combine(SamplesUtils.SamplesDirectory, GeArtificialAntSampleFileName + SamplesUtils.SampleFileExtension);
    43       XmlGenerator.Serialize(geaa, path);
     46      serializer.Serialize(geaa, path);
    4447    }
    4548
    … …  
    8083      var geSymbReg = CreateGeSymbolicRegressionSample();
    8184      string path = Path.Combine(SamplesUtils.SamplesDirectory, GeSymbolicRegressionSampleFileName + SamplesUtils.SampleFileExtension);
    82       XmlGenerator.Serialize(geSymbReg, path);
     85      serializer.Serialize(geSymbReg, path);
    8386    }
    8487

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/IslandGaTspSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.GeneticAlgorithm;
    2526using HeuristicLab.Encodings.PermutationEncoding;
    2627using HeuristicLab.Optimization.Operators;
    27 using HeuristicLab.Persistence.Default.Xml;
    2828using HeuristicLab.Problems.Instances.TSPLIB;
    2929using HeuristicLab.Problems.TravelingSalesman;
    … …  
    3535  public class UnitTest1 {
    3636    private const string SampleFileName = "IslandGA_TSP";
     37    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3738
    3839    [TestMethod]
    … …  
    4243      var ga = CreateIslandGaTspSample();
    4344      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    44       XmlGenerator.Serialize(ga, path);
     45      serializer.Serialize(ga, path);
    4546    }
    4647    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/LocalSearchKnapsackSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.LocalSearch;
    2526using HeuristicLab.Data;
    2627using HeuristicLab.Encodings.BinaryVectorEncoding;
    27 using HeuristicLab.Persistence.Default.Xml;
    2828using HeuristicLab.Problems.Knapsack;
    2929using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3333  public class LocalSearchKnapsackSampleTest {
    3434    private const string SampleFileName = "LS_Knapsack";
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3536
    3637    [TestMethod]
    … …  
    4041      var ls = CreateLocalSearchKnapsackSample();
    4142      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    42       XmlGenerator.Serialize(ls, path);
     43      serializer.Serialize(ls, path);
    4344    }
    4445    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/OSESGriewankSampleTest.cs

    r16565 r17120  
    2121
    2222using System.IO;
    23 using HeuristicLab.Algorithms.EvolutionStrategy;
     23using HEAL.Attic;
    2424using HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy;
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.Xml;
    2827using HeuristicLab.Problems.TestFunctions;
    2928using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3332  public class OSESGriewankSampleTest {
    3433    private const string SampleFileName = "OSES_Griewank";
     34    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3535
    3636    [TestMethod]
    … …  
    4040      var es = CreateOSESGriewankSample();
    4141      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    42       XmlGenerator.Serialize(es, path);
     42      serializer.Serialize(es, path);
    4343    }
    4444

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/PsoRastriginSampleTest.cs

    r16565 r17120  
    2323using System.IO;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Algorithms.ParticleSwarmOptimization;
    2627using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.Xml;
    2828using HeuristicLab.Problems.TestFunctions;
    2929using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3333  public class PsoRastriginSampleTest {
    3434    private const string SampleFileName = "PSO_Rastrigin";
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3536
    3637    [TestMethod]
    … …  
    4041      var pso = CreatePsoRastriginSample();
    4142      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    42       XmlGenerator.Serialize(pso, path);
     43      serializer.Serialize(pso, path);
    4344    }
    4445    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/RAPGASchedulingSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.RAPGA;
    2526using HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix;
    26 using HeuristicLab.Persistence.Default.Xml;
    2727using HeuristicLab.Problems.Scheduling;
    2828using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3232  public class RAPGASchedulingSampleTest {
    3333    private const string SampleFileName = "RAPGA_JSSP";
     34    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3435
    3536    [TestMethod]
    … …  
    3940      var ss = CreateRAPGASchedulingSample();
    4041      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    41       XmlGenerator.Serialize(ss, path);
     42      serializer.Serialize(ss, path);
    4243    }
    4344

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/ScatterSearchVRPSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.ScatterSearch;
    25 using HeuristicLab.Persistence.Default.Xml;
    2626using HeuristicLab.Problems.Instances.VehicleRouting;
    2727using HeuristicLab.Problems.VehicleRouting;
    … …  
    3232  public class ScatterSearchVRPSampleTest {
    3333    private const string SampleFileName = "SS_VRP";
     34    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3435
    3536    [TestMethod]
    … …  
    3940      var ss = CreateScatterSearchVRPSample();
    4041      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    41       XmlGenerator.Serialize(ss, path);
     42      serializer.Serialize(ss, path);
    4243    }
    4344

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SimulatedAnnealingRastriginSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.SimulatedAnnealing;
    2526using HeuristicLab.Data;
    2627using HeuristicLab.Encodings.RealVectorEncoding;
    2728using HeuristicLab.Optimization.Operators;
    28 using HeuristicLab.Persistence.Default.Xml;
    2929using HeuristicLab.Problems.TestFunctions;
    3030using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3434  public class SimulatedAnnealingRastriginSampleTest {
    3535    private const string SampleFileName = "SA_Rastrigin";
     36    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3637
    3738    [TestMethod]
    … …  
    4142      var sa = CreateSimulatedAnnealingRastriginSample();
    4243      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    43       XmlGenerator.Serialize(sa, path);
     44      serializer.Serialize(sa, path);
    4445    }
    4546    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/TabuSearchTspSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.TabuSearch;
    2526using HeuristicLab.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.Xml;
    2727using HeuristicLab.Problems.Instances.TSPLIB;
    2828using HeuristicLab.Problems.TravelingSalesman;
    … …  
    3333  public class TabuSearchTspSampleTest {
    3434    private const string SampleFileName = "TS_TSP";
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3536
    3637    [TestMethod]
    … …  
    4041      var ts = CreateTabuSearchTspSample();
    4142      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    42       XmlGenerator.Serialize(ts, path);
     43      serializer.Serialize(ts, path);
    4344    }
    4445    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/TabuSearchVRPSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.TabuSearch;
    25 using HeuristicLab.Persistence.Default.Xml;
    2626using HeuristicLab.Problems.Instances.VehicleRouting;
    2727using HeuristicLab.Problems.VehicleRouting;
    … …  
    3333  public class TabuSearchVRPSampleTest {
    3434    private const string SampleFileName = "TS_VRP";
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3536
    3637    [TestMethod]
    … …  
    4041      var vrp = CreateTabuSearchVrpSample();
    4142      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    42       XmlGenerator.Serialize(vrp, path);
     43      serializer.Serialize(vrp, path);
    4344    }
    4445    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/VnsOpSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.VariableNeighborhoodSearch;
    2526using HeuristicLab.Data;
    2627using HeuristicLab.Encodings.IntegerVectorEncoding;
    27 using HeuristicLab.Persistence.Default.Xml;
    2828using HeuristicLab.Problems.Orienteering;
    2929using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3333  public class VnsOpSampleTest {
    3434    private const string SampleFileName = "VNS_OP";
     35    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3536
    3637    [TestMethod]
    … …  
    4041      var vns = CreateVnsOpSample();
    4142      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    42       XmlGenerator.Serialize(vns, path);
     43      serializer.Serialize(vns, path);
    4344    }
    4445    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/Samples/VnsTspSampleTest.cs

    r16565 r17120  
    2222using System.IO;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Algorithms.LocalSearch;
    2526using HeuristicLab.Algorithms.VariableNeighborhoodSearch;
    2627using HeuristicLab.Data;
    2728using HeuristicLab.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.Xml;
    2929using HeuristicLab.Problems.TravelingSalesman;
    3030using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3434  public class VnsTspSampleTest {
    3535    private const string SampleFileName = "VNS_TSP";
     36    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
    3637
    3738    [TestMethod]
    … …  
    4142      var vns = CreateVnsTspSample();
    4243      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
    43       XmlGenerator.Serialize(vns, path);
     44      serializer.Serialize(vns, path);
    4445    }
    4546    [TestMethod]

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab-3.3/StorableTest.cs

    r16571 r17120  
    2727using HEAL.Attic;
    2828using HeuristicLab.Common;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3029using HeuristicLab.PluginInfrastructure;
    3130using Microsoft.VisualStudio.TestTools.UnitTesting;
Note: See TracChangeset for help on using the changeset viewer.