Changeset 15575

Timestamp:

01/05/18 00:22:04 (7 years ago)

Author:

abeham

Message:

#1614:

• Added two LocalSolver models (binary and integer)

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3

Files:

• CPLEX/CplexSolver.cs (modified) (2 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.csproj (modified) (4 diffs)
• HeuristicLab.snk (deleted)
• LocalSolverNet (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolver)
• LocalSolverNet/GQAPBinarySolver.cs (added)
• LocalSolverNet/GQAPIntegerSolver.cs (added)
• LocalSolverNet/LocalSolverContext.cs (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/CplexContext.cs) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/CplexSolver.cs

@@ -59 +59 @@
     }
 
-    protected override void Initialize(CancellationToken cancellationToken) {
-      base.Initialize(cancellationToken);
-
-      try {
-        Context.RunOperator(Analyzer, cancellationToken);
-      } catch (OperationCanceledException) { }
-    }
-
     protected override void Run(CancellationToken cancellationToken) {
       var factory = new OplFactory();
@@ -100 +92 @@
       if (HasIncumbent()) {
         var val = GetIncumbentObjValue();
-        if (val == prev) return;
+        if (val >= prev) return;
         algorithm.Context.Iterations++;
         algorithm.Context.BestQuality = val;

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.csproj

@@ -32 +32 @@
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
@@ -38 +38 @@
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
@@ -133 +134 @@
     <Compile Include="LocalSearch\IteratedLS.cs" />
     <Compile Include="LocalSearch\MultistartLS.cs" />
+    <Compile Include="LocalSolverNet\GQAPIntegerSolver.cs" />
+    <Compile Include="LocalSolverNet\LocalSolverContext.cs" />
+    <Compile Include="LocalSolverNet\GQAPBinarySolver.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Infrastructure\Contexts\SingleSolutionContext.cs" />
@@ -156 +160 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="HeuristicLab.snk" />
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/LocalSolverContext.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.CPLEX {
-  [Item("CPLEX Context", "A context for CPLEX solvers.")]
-  public class CplexContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
-    
+namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
+  [Item("LocalSolver Context", "A context for CPLEX solvers.")]
+  public class LocalSolverContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
+
+    [Storable]
+    private IValueParameter<GQAP> problem;
+    public GQAP Problem {
+      get { return problem.Value; }
+      set { problem.Value = value; }
+    }
+
+    [Storable]
+    private IValueParameter<GQAPSolution> bestSolution;
+    public GQAPSolution BestSolution {
+      get { return bestSolution.Value; }
+      set { bestSolution.Value = value; }
+    }
+
     [StorableConstructor]
-    protected CplexContext(bool deserializing) : base(deserializing) { }
-    protected CplexContext(CplexContext original, Cloner cloner)
+    protected LocalSolverContext(bool deserializing) : base(deserializing) { }
+    protected LocalSolverContext(LocalSolverContext original, Cloner cloner)
       : base(original, cloner) {
+      problem = cloner.Clone(original.problem);
+      bestSolution = cloner.Clone(original.bestSolution);
     }
-    public CplexContext() : base() { }
-    public CplexContext(string name) : base(name) { }
-    public CplexContext(string name, ParameterCollection parameters) : base(name, parameters) { }
-    public CplexContext(string name, string description) : base(name, description) { }
-    public CplexContext(string name, string description, ParameterCollection parameters) : base(name, description, parameters) { }
+    public LocalSolverContext() : base() {
+      Parameters.Add(problem = new ValueParameter<GQAP>("Problem"));
+      Parameters.Add(bestSolution = new ValueParameter<GQAPSolution>("BestFoundSolution"));
+    }
+    public LocalSolverContext(string name) : base(name) {
+      Parameters.Add(problem = new ValueParameter<GQAP>("Problem"));
+      Parameters.Add(bestSolution = new ValueParameter<GQAPSolution>("BestFoundSolution"));
+    }
+    public LocalSolverContext(string name, ParameterCollection parameters) : base(name, parameters) {
+      Parameters.Add(problem = new ValueParameter<GQAP>("Problem"));
+      Parameters.Add(bestSolution = new ValueParameter<GQAPSolution>("BestFoundSolution"));
+    }
+    public LocalSolverContext(string name, string description) : base(name, description) {
+      Parameters.Add(problem = new ValueParameter<GQAP>("Problem"));
+      Parameters.Add(bestSolution = new ValueParameter<GQAPSolution>("BestFoundSolution"));
+    }
+    public LocalSolverContext(string name, string description, ParameterCollection parameters) : base(name, description, parameters) {
+      Parameters.Add(problem = new ValueParameter<GQAP>("Problem"));
+      Parameters.Add(bestSolution = new ValueParameter<GQAPSolution>("BestFoundSolution"));
+    }
     
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new CplexContext(this, cloner);
+      return new LocalSolverContext(this, cloner);
+    }
+
+    public ISingleObjectiveSolutionScope<GQAPSolution> ToScope(GQAPSolution code, double fitness = double.NaN) {
+      var name = Problem.Encoding.Name;
+      var scope = new SingleObjectiveSolutionScope<GQAPSolution>(code,
+        name + "Solution", fitness, Problem.Evaluator.QualityParameter.ActualName) {
+        Parent = Scope
+      };
+      scope.Variables.Add(new Variable(name, code.Assignment));
+      scope.Variables.Add(new Variable("Evaluation", code.Evaluation));
+      return scope;
     }
   }