Changeset 14642 for branches/OptimizationNetworks

Timestamp:

02/03/17 09:15:44 (8 years ago)

Author:

abeham

Message:

#2205: added disposal of errorhandler and datasource

File:

• branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/FLPCplexSolver.cs (modified) (3 diffs)

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

@@ -84 +84 @@
       var cplex = factory.CreateCplex();
 
-      var errorHandler = factory.CreateOplErrorHandler();
 
-      var dataSource = new FLPDataSource(factory, Problem);
       var model = Assembly.GetExecutingAssembly().GetManifestResourceNames().SingleOrDefault(x => x.EndsWith(@".FLP.mod"));
       var modelStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(model);
@@ -95 +93 @@
       using (var reader = new StreamReader(modelStream))
       using (var modelSource = factory.CreateOplModelSourceFromString(reader.ReadToEnd(), Path.GetFileNameWithoutExtension(model)))
+      using (var errorHandler = factory.CreateOplErrorHandler())
       using (var settings = factory.CreateOplSettings(errorHandler))
       using (var def = factory.CreateOplModelDefinition(modelSource, settings))
-      using (var opl = factory.CreateOplModel(def, cplex)) {
+      using (var opl = factory.CreateOplModel(def, cplex))
+      using (var dataSource = new FLPDataSource(factory, Problem)) {
         opl.AddDataSource(dataSource);
         opl.Generate();
         cplex.SetParam(Cplex.DoubleParam.TiLim, MaximumRuntimeParameter.Value.Value.TotalSeconds);
-        //cplex.ExportModel("model.lp");
-        //opl.ConvertAllIntVars();
         var solved = cplex.Solve();
         var assignment = new IntegerVector(customers);
@@ -113 +111 @@
 
           var sol = opl.GetElement(FLPDataSource.CustomerDepotAssignment).AsIntMap();
-          
+
           for (var i = 0; i < depots; i++) {
             var solI = sol.GetSub(i);