Changeset 16946 for branches/2521_ProblemRefactoring/HeuristicLab.ExactOptimization

Timestamp:

05/13/19 13:59:30 (6 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes up to r16945 into branch.

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.ExactOptimization (copied) (copied from trunk/HeuristicLab.ExactOptimization)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/ProgrammableLinearProblemDefinition.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/ProgrammableLinearProblemDefinition.cs

@@ -24 +24 @@
 using System.Reflection;
 using Google.OrTools.LinearSolver;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.ExactOptimization.LinearProgramming.Templates;
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.Programmable;
 using HeuristicLab.Scripting;
-using HEAL.Attic;
 
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
@@ -50 +49 @@
 
     public ProgrammableLinearProblemDefinition()
-      : base(ScriptTemplates.CompiledLinearProblemDefinition) {
+      : base(Templates.ScriptTemplates.CompiledLinearProblemDefinition) {
       Name = "Programmable Linear Problem Definition";
       variableStore = new VariableStore();