Changeset 14646

Timestamp:

02/03/17 15:19:53 (7 years ago)

Author:

abeham

Message:

#2205: Added version of FLP that minimizes opening costs only

Location:

branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3

Files:

• FLPCplexSolver.cs (modified) (5 diffs)
• FLP_2.mod (copied) (copied from branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/FLP.mod) (1 diff)
• HeuristicLab.Problems.FacilityLocation.CplexSolver-3.3.csproj (modified) (1 diff)

branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/FLPCplexSolver.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -39 +37 @@
 
 namespace HeuristicLab.Problems.FacilityLocation.CplexSolver {
+  public enum FlpVariant { FLP, FLP_2 }
+
   [Item("FLP CPLEX Solver", "Solves facility location problem (FLP) instances using CPLEX.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
@@ -58 +58 @@
     [Storable]
     private IFixedValueParameter<TimeSpanValue> maximumRuntimeParameter;
-
-    private bool supportsPause;
-
     public IFixedValueParameter<TimeSpanValue> MaximumRuntimeParameter {
       get { return maximumRuntimeParameter; }
+    }
+
+    public TimeSpan MaximumRuntime {
+      get { return maximumRuntimeParameter.Value.Value; }
+      set { maximumRuntimeParameter.Value.Value = value; }
+    }
+
+    [Storable]
+    private IFixedValueParameter<EnumValue<FlpVariant>> flpVariantParameter;
+    public IFixedValueParameter<EnumValue<FlpVariant>> FlpVariantParameter {
+      get { return flpVariantParameter; }
+    }
+
+    public FlpVariant FlpVariant {
+      get { return flpVariantParameter.Value.Value; }
+      set { flpVariantParameter.Value.Value = value; }
     }
 
@@ -70 +83 @@
       : base(original, cloner) {
       maximumRuntimeParameter = cloner.Clone(original.maximumRuntimeParameter);
+      flpVariantParameter = cloner.Clone(original.flpVariantParameter);
     }
     public FLPCplexSolver() {
       Parameters.Add(maximumRuntimeParameter = new FixedValueParameter<TimeSpanValue>("Maximum Runtime", "Specifies how long CPLEX should be allowed to run.", new TimeSpanValue(TimeSpan.FromSeconds(60))));
+      Parameters.Add(flpVariantParameter = new FixedValueParameter<EnumValue<FlpVariant>>("FLP Variant", "Which FLP variant should be run.", new EnumValue<FlpVariant>(FlpVariant.FLP)));
       Problem = new FacilityLocationProblem();
     }
@@ -85 +100 @@
 
 
-      var model = Assembly.GetExecutingAssembly().GetManifestResourceNames().SingleOrDefault(x => x.EndsWith(@".FLP.mod"));
+      var model = Assembly.GetExecutingAssembly().GetManifestResourceNames().SingleOrDefault(x => x.EndsWith(@"." + FlpVariant.ToString() + ".mod"));
       var modelStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(model);
 

branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/FLP_2.mod

@@ -16 +16 @@
 
 minimize
-( sum ( i in 0..(I-1), j in 0..(J-1) ) ( c[i][j] * x[i][j] ) + sum ( i in 0..(I-1) ) ( f[i] * y[i] ) );
+( sum ( i in 0..(I-1) ) ( f[i] * y[i] ) );
 
 

branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/HeuristicLab.Problems.FacilityLocation.CplexSolver-3.3.csproj

@@ -127 +127 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="FLP_2.mod" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>