Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/29/19 15:57:35 (5 years ago)
Author:
mkommend
Message:

#2521: Merged trunk changes into problem refactoring branch.

Location:
branches/2521_ProblemRefactoring
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/2521_ProblemRefactoring

  • branches/2521_ProblemRefactoring/HeuristicLab.Tests

  • branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GAQAPScriptTest.cs

    r16723 r17226  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System.IO;
    2323using System.Linq;
    24 using HeuristicLab.Persistence.Default.Xml;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.Instances.QAPLIB;
    2626using HeuristicLab.Problems.QuadraticAssignment;
    … …  
    3737    private const string BestQualityVariableName = "bestQuality";
    3838
     39    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     40
    3941    [TestMethod]
    4042    [TestCategory("Scripts.Create")]
    … …  
    4345      var script = CreateGAQAPScript();
    4446      string path = Path.Combine(ScriptingUtils.ScriptsDirectory, ScriptFileName + ScriptingUtils.ScriptFileExtension);
    45       XmlGenerator.Serialize(script, path);
     47      serializer.Serialize(script, path);
    4648    }
    4749

  • branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GUIAutomationScriptTest.cs

    r16723 r17226  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using System.IO;
    23 using HeuristicLab.Persistence.Default.Xml;
     23using HEAL.Attic;
    2424using HeuristicLab.Scripting;
    2525using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3232    private const string ScriptItemDescription = "A script that runs a genetic algorithm on a traveling salesman problem with 5 different settings for population sizes and with 10 repetitions, then opens a bubble chart of the results and chooses the appropriate values for x and y axis automatically";
    3333
     34    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     35
    3436    [TestMethod]
    3537    [TestCategory("Scripts.Create")]
    … …  
    3840      var script = CreateGUIAutomationScript();
    3941      string path = Path.Combine(ScriptingUtils.ScriptsDirectory, ScriptFileName + ScriptingUtils.ScriptFileExtension);
    40       XmlGenerator.Serialize(script, path);
     42      serializer.Serialize(script, path);
    4143    }
    4244

  • branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchRFClassificationScriptTest.cs

    r16723 r17226  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System.IO;
    2323using System.Linq;
    24 using HeuristicLab.Persistence.Default.Xml;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.DataAnalysis;
    2626using HeuristicLab.Problems.Instances.DataAnalysis;
    … …  
    3838    private const string BestSolutionVariableName = "bestSolution";
    3939
     40    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     41
    4042    [TestMethod]
    4143    [TestCategory("Scripts.Create")]
    … …  
    4446      var script = CreateGridSearchRFClassificationScript();
    4547      string path = Path.Combine(ScriptingUtils.ScriptsDirectory, ScriptFileName + ScriptingUtils.ScriptFileExtension);
    46       XmlGenerator.Serialize(script, path);
     48      serializer.Serialize(script, path);
    4749    }
    4850

  • branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchRFRegressionScriptTest.cs

    r16723 r17226  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System.IO;
    2323using System.Linq;
    24 using HeuristicLab.Persistence.Default.Xml;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.DataAnalysis;
    2626using HeuristicLab.Problems.Instances.DataAnalysis;
    … …  
    3838    private const string BestSolutionVariableName = "bestSolution";
    3939
     40    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     41
    4042    [TestMethod]
    4143    [TestCategory("Scripts.Create")]
    … …  
    4446      var script = CreateGridSearchRFRegressionScript();
    4547      string path = Path.Combine(ScriptingUtils.ScriptsDirectory, ScriptFileName + ScriptingUtils.ScriptFileExtension);
    46       XmlGenerator.Serialize(script, path);
     48      serializer.Serialize(script, path);
    4749    }
    4850

  • branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchSVMClassificationScriptTest.cs

    r16723 r17226  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System.IO;
    2323using System.Linq;
    24 using HeuristicLab.Persistence.Default.Xml;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.DataAnalysis;
    2626using HeuristicLab.Problems.Instances.DataAnalysis;
    … …  
    3838    private const string BestSolutionVariableName = "bestSolution";
    3939
     40    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     41
    4042    [TestMethod]
    4143    [TestCategory("Scripts.Create")]
    … …  
    4446      var script = CreateGridSearchSVMClassificationScript();
    4547      string path = Path.Combine(ScriptingUtils.ScriptsDirectory, ScriptFileName + ScriptingUtils.ScriptFileExtension);
    46       XmlGenerator.Serialize(script, path);
     48      serializer.Serialize(script, path);
    4749    }
    4850

  • branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchSVMRegressionScriptTest.cs

    r16723 r17226  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System.IO;
    2323using System.Linq;
    24 using HeuristicLab.Persistence.Default.Xml;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.DataAnalysis;
    2626using HeuristicLab.Problems.Instances.DataAnalysis;
    … …  
    3838    private const string BestSolutionVariableName = "bestSolution";
    3939
     40    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     41
    4042    [TestMethod]
    4143    [TestCategory("Scripts.Create")]
    … …  
    4446      var script = CreateGridSearchSVMRegressionScript();
    4547      string path = Path.Combine(ScriptingUtils.ScriptsDirectory, ScriptFileName + ScriptingUtils.ScriptFileExtension);
    46       XmlGenerator.Serialize(script, path);
     48      serializer.Serialize(script, path);
    4749    }
    4850

  • branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/OSGARastriginScriptTest.cs

    r16723 r17226  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using System.IO;
     23using HEAL.Attic;
    2324using HeuristicLab.Data;
    24 using HeuristicLab.Persistence.Default.Xml;
    2525using HeuristicLab.Scripting;
    2626using Microsoft.VisualStudio.TestTools.UnitTesting;
    … …  
    3838    private const string BestQualityVariableName = "bestFitness";
    3939
     40    private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
     41
    4042    [TestMethod]
    4143    [TestCategory("Scripts.Create")]
    … …  
    4446      var script = CreateOSGARastriginScript();
    4547      string path = Path.Combine(ScriptingUtils.ScriptsDirectory, ScriptFileName + ScriptingUtils.ScriptFileExtension);
    46       XmlGenerator.Serialize(script, path);
     48      serializer.Serialize(script, path);
    4749    }
    4850

  • branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/ScriptingUtils.cs

    r16723 r17226  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.