Changeset 16736 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms
- Timestamp:
- 04/01/19 17:29:06 (5 years ago)
- Location:
- branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingAlgorithm.cs
r16582 r16736 28 28 using HeuristicLab.Optimization; 29 29 using HeuristicLab.Parameters; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.ExactOptimization.LinearProgramming { … … 35 35 "See also https://dev.heuristiclab.com/trac.fcgi/wiki/Documentation/Reference/ExactOptimization")] 36 36 [Creatable(CreatableAttribute.Categories.ExactAlgorithms)] 37 [Storable Class]37 [StorableType("D6BAE020-6315-4C8A-928F-E47C67F3BE8F")] 38 38 public sealed class LinearProgrammingAlgorithm : BasicAlgorithm { 39 39 … … 157 157 158 158 [StorableConstructor] 159 private LinearProgrammingAlgorithm(bool deserializing) 160 : base(deserializing) { 161 } 159 private LinearProgrammingAlgorithm(StorableConstructorFlag _) : base(_) { } 162 160 163 161 private LinearProgrammingAlgorithm(LinearProgrammingAlgorithm original, Cloner cloner) -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ExternalIncrementalLinearSolver.cs
r16582 r16736 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.ExactOptimization.LinearProgramming { 29 29 30 [Storable Class]30 [StorableType("CF3FC8B1-37DF-4A08-9DE5-AB578E1132DD")] 31 31 public class ExternalIncrementalLinearSolver : IncrementalLinearSolver, IExternalLinearSolver { 32 32 protected const string FileDialogFilter = "Dynamic-Link Library (*.dll)|*.dll|All Files (*.*)|*.*"; … … 39 39 40 40 [StorableConstructor] 41 protected ExternalIncrementalLinearSolver(bool deserializing) 42 : base(deserializing) { 43 } 41 protected ExternalIncrementalLinearSolver(StorableConstructorFlag _) : base(_) { } 44 42 45 43 protected ExternalIncrementalLinearSolver(ExternalIncrementalLinearSolver original, Cloner cloner) -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ExternalLinearSolver.cs
r16582 r16736 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.ExactOptimization.LinearProgramming { 29 29 30 [Storable Class]30 [StorableType("612FCAEF-ABB9-48CC-9041-2B871B831C3C")] 31 31 public class ExternalLinearSolver : LinearSolver, IExternalLinearSolver { 32 32 protected const string FileDialogFilter = "Dynamic-Link Library (*.dll)|*.dll|All Files (*.*)|*.*"; … … 39 39 40 40 [StorableConstructor] 41 protected ExternalLinearSolver(bool deserializing) 42 : base(deserializing) { 43 } 41 protected ExternalLinearSolver(StorableConstructorFlag _) : base(_) { } 44 42 45 43 protected ExternalLinearSolver(ExternalLinearSolver original, Cloner cloner) -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IncrementalLinearSolver.cs
r16582 r16736 30 30 using HeuristicLab.Optimization; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 34 34 namespace HeuristicLab.ExactOptimization.LinearProgramming { 35 35 36 [Storable Class]36 [StorableType("8730ECDD-8F38-47C2-B0D9-2B1F38FC0A27")] 37 37 public class IncrementalLinearSolver : LinearSolver, IIncrementalLinearSolver { 38 38 … … 65 65 66 66 [StorableConstructor] 67 protected IncrementalLinearSolver(bool deserializing) 68 : base(deserializing) { 69 } 67 protected IncrementalLinearSolver(StorableConstructorFlag _) : base(_) { } 70 68 71 69 protected IncrementalLinearSolver(IncrementalLinearSolver original, Cloner cloner) -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/LinearSolver.cs
r16582 r16736 32 32 using HeuristicLab.Optimization; 33 33 using HeuristicLab.Parameters; 34 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;34 using HEAL.Attic; 35 35 36 36 namespace HeuristicLab.ExactOptimization.LinearProgramming { 37 37 38 [Storable Class]38 [StorableType("D0657902-BE8B-4826-B832-FDA84E9B24C3")] 39 39 public class LinearSolver : ParameterizedNamedItem, ILinearSolver, IDisposable { 40 40 … … 56 56 57 57 [StorableConstructor] 58 protected LinearSolver(bool deserializing) 59 : base(deserializing) { 60 } 58 protected LinearSolver(StorableConstructorFlag _) : base(_) { } 61 59 62 60 protected LinearSolver(LinearSolver original, Cloner cloner) -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/BopSolver.cs
r16582 r16736 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.ExactOptimization.LinearProgramming { 31 31 32 32 [Item("BOP", "BOP (https://developers.google.com/optimization/reference/bop/bop_solver/) can be used out of the box.")] 33 [Storable Class]33 [StorableType("6AE85366-34FC-42C3-B1A3-BFC976CCE830")] 34 34 public class BopSolver : IncrementalLinearSolver { 35 35 … … 49 49 50 50 [StorableConstructor] 51 protected BopSolver(bool deserializing) 52 : base(deserializing) { 53 } 51 protected BopSolver(StorableConstructorFlag _) : base(_) { } 54 52 55 53 protected override Solver.OptimizationProblemType OptimizationProblemType => -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CoinOrSolver.cs
r16582 r16736 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.ExactOptimization.LinearProgramming { 28 28 29 29 [Item("Clp/Cbc", "Clp (https://projects.coin-or.org/Clp) and Cbc (https://projects.coin-or.org/Cbc) can be used out of the box.")] 30 [Storable Class]30 [StorableType("53148A15-C754-4CCA-AFAA-200916CDB7F5")] 31 31 public class CoinOrSolver : IncrementalLinearSolver { 32 32 … … 40 40 41 41 [StorableConstructor] 42 protected CoinOrSolver(bool deserializing) 43 : base(deserializing) { 44 } 42 protected CoinOrSolver(StorableConstructorFlag _) : base(_) { } 45 43 46 44 public override bool SupportsPause => false; -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CplexSolver.cs
r16718 r16736 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.ExactOptimization.LinearProgramming { 31 31 32 32 [Item("CPLEX", "CPLEX (https://www.ibm.com/analytics/cplex-optimizer) must be installed and licensed.")] 33 [Storable Class]33 [StorableType("E3478254-F3A8-4085-A9DA-DB79D0A50347")] 34 34 public class CplexSolver : ExternalIncrementalLinearSolver { 35 35 … … 49 49 50 50 [StorableConstructor] 51 protected CplexSolver(bool deserializing) 52 : base(deserializing) { 53 } 51 protected CplexSolver(StorableConstructorFlag _) : base(_) { } 54 52 55 53 protected CplexSolver(CplexSolver original, Cloner cloner) -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlopSolver.cs
r16718 r16736 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Data; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.ExactOptimization.LinearProgramming { 30 30 31 31 [Item("Glop", "Glop (https://developers.google.com/optimization/lp/glop) can be used out of the box.")] 32 [Storable Class]32 [StorableType("A05DA123-2779-4175-991E-C4790C5C2E00")] 33 33 public class GlopSolver : IncrementalLinearSolver { 34 34 … … 44 44 45 45 [StorableConstructor] 46 protected GlopSolver(bool deserializing) 47 : base(deserializing) { 48 } 46 protected GlopSolver(StorableConstructorFlag _) : base(_) { } 49 47 50 48 protected GlopSolver(GlopSolver original, Cloner cloner) -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlpkSolver.cs
r16582 r16736 25 25 using HeuristicLab.Data; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.ExactOptimization.LinearProgramming { 30 30 31 31 [Item("GLPK", "GLPK (https://www.gnu.org/software/glpk/) can be used out of the box.")] 32 [Storable Class]32 [StorableType("CD1F0577-D68A-483B-8811-17E04573B3F2")] 33 33 public class GlpkSolver : ExternalLinearSolver { 34 34 … … 44 44 45 45 [StorableConstructor] 46 protected GlpkSolver(bool deserializing) 47 : base(deserializing) { 48 } 46 protected GlpkSolver(StorableConstructorFlag _) : base(_) { } 49 47 50 48 public override bool SupportsPause => false; -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GurobiSolver.cs
r16718 r16736 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.ExactOptimization.LinearProgramming { 31 31 32 32 [Item("Gurobi", "Gurobi (http://www.gurobi.com/) must be installed and licensed.")] 33 [Storable Class]33 [StorableType("2C567159-8C09-4B5F-BFF8-D72561686C6B")] 34 34 public class GurobiSolver : ExternalIncrementalLinearSolver { 35 35 … … 52 52 53 53 [StorableConstructor] 54 protected GurobiSolver(bool deserializing) 55 : base(deserializing) { 56 } 54 protected GurobiSolver(StorableConstructorFlag _) : base(_) { } 57 55 58 56 protected override Solver.OptimizationProblemType OptimizationProblemType => -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/ScipSolver.cs
r16718 r16736 28 28 using HeuristicLab.Optimization; 29 29 using HeuristicLab.Parameters; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.ExactOptimization.LinearProgramming { 33 33 34 34 [Item("SCIP", "SCIP (http://scip.zib.de/) must be installed and licensed.")] 35 [Storable Class]35 [StorableType("A4185E0D-25AE-48C4-8136-A764780683D5")] 36 36 public class ScipSolver : ExternalIncrementalLinearSolver { 37 37 private TimeSpan timeLimit = TimeSpan.Zero; … … 51 51 52 52 [StorableConstructor] 53 protected ScipSolver(bool deserializing) 54 : base(deserializing) { 55 } 53 protected ScipSolver(StorableConstructorFlag _) : base(_) { } 56 54 57 55 protected ScipSolver(ScipSolver original, Cloner cloner)
Note: See TracChangeset
for help on using the changeset viewer.