Changeset 16736


Ignore:
Timestamp:
04/01/19 17:29:06 (6 months ago)
Author:
ddorfmei
Message:

#2931: Upgraded persistence to HEAL.Attic

Location:
branches
Files:
1 added
18 edited

Legend:

Unmodified
Added
Removed
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/TextValue.cs

    r16373 r16736  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Data {
    2727  [Item("TextValue", "Represents a multiline string.")]
    28   [StorableClass]
     28  [StorableType("136E9CD4-D340-44B1-A7CE-CF1A70D1C032")]
    2929  public class TextValue : StringValue, ITextValue {
    3030
     
    4040
    4141    [StorableConstructor]
    42     protected TextValue(bool deserializing) : base(deserializing) { }
     42    protected TextValue(StorableConstructorFlag _) : base(_) { }
    4343
    4444    protected TextValue(TextValue original, Cloner cloner)
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/HeuristicLab.ExactOptimization-3.3.csproj

    r16719 r16736  
    114114      <SpecificVersion>False</SpecificVersion>
    115115      <HintPath>..\..\bin\Google.OrTools.dll</HintPath>
     116    </Reference>
     117    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     118      <SpecificVersion>False</SpecificVersion>
     119      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
    116120    </Reference>
    117121    <Reference Include="HeuristicLab.OrTools-7.0.0, Version=6.10.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     
    224228      <Name>HeuristicLab.Parameters-3.3</Name>
    225229    </ProjectReference>
    226     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    227       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    228       <Name>HeuristicLab.Persistence-3.3</Name>
    229     </ProjectReference>
    230230    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    231231      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingAlgorithm.cs

    r16582 r16736  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.ExactOptimization.LinearProgramming {
     
    3535    "See also https://dev.heuristiclab.com/trac.fcgi/wiki/Documentation/Reference/ExactOptimization")]
    3636  [Creatable(CreatableAttribute.Categories.ExactAlgorithms)]
    37   [StorableClass]
     37  [StorableType("D6BAE020-6315-4C8A-928F-E47C67F3BE8F")]
    3838  public sealed class LinearProgrammingAlgorithm : BasicAlgorithm {
    3939
     
    157157
    158158    [StorableConstructor]
    159     private LinearProgrammingAlgorithm(bool deserializing)
    160       : base(deserializing) {
    161     }
     159    private LinearProgrammingAlgorithm(StorableConstructorFlag _) : base(_) { }
    162160
    163161    private LinearProgrammingAlgorithm(LinearProgrammingAlgorithm original, Cloner cloner)
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ExternalIncrementalLinearSolver.cs

    r16582 r16736  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2929
    30   [StorableClass]
     30  [StorableType("CF3FC8B1-37DF-4A08-9DE5-AB578E1132DD")]
    3131  public class ExternalIncrementalLinearSolver : IncrementalLinearSolver, IExternalLinearSolver {
    3232    protected const string FileDialogFilter = "Dynamic-Link Library (*.dll)|*.dll|All Files (*.*)|*.*";
     
    3939
    4040    [StorableConstructor]
    41     protected ExternalIncrementalLinearSolver(bool deserializing)
    42       : base(deserializing) {
    43     }
     41    protected ExternalIncrementalLinearSolver(StorableConstructorFlag _) : base(_) { }
    4442
    4543    protected ExternalIncrementalLinearSolver(ExternalIncrementalLinearSolver original, Cloner cloner)
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ExternalLinearSolver.cs

    r16582 r16736  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2929
    30   [StorableClass]
     30  [StorableType("612FCAEF-ABB9-48CC-9041-2B871B831C3C")]
    3131  public class ExternalLinearSolver : LinearSolver, IExternalLinearSolver {
    3232    protected const string FileDialogFilter = "Dynamic-Link Library (*.dll)|*.dll|All Files (*.*)|*.*";
     
    3939
    4040    [StorableConstructor]
    41     protected ExternalLinearSolver(bool deserializing)
    42       : base(deserializing) {
    43     }
     41    protected ExternalLinearSolver(StorableConstructorFlag _) : base(_) { }
    4442
    4543    protected ExternalLinearSolver(ExternalLinearSolver original, Cloner cloner)
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IncrementalLinearSolver.cs

    r16582 r16736  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333
    3434namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3535
    36   [StorableClass]
     36  [StorableType("8730ECDD-8F38-47C2-B0D9-2B1F38FC0A27")]
    3737  public class IncrementalLinearSolver : LinearSolver, IIncrementalLinearSolver {
    3838
     
    6565
    6666    [StorableConstructor]
    67     protected IncrementalLinearSolver(bool deserializing)
    68       : base(deserializing) {
    69     }
     67    protected IncrementalLinearSolver(StorableConstructorFlag _) : base(_) { }
    7068
    7169    protected IncrementalLinearSolver(IncrementalLinearSolver original, Cloner cloner)
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/LinearSolver.cs

    r16582 r16736  
    3232using HeuristicLab.Optimization;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Attic;
    3535
    3636namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3737
    38   [StorableClass]
     38  [StorableType("D0657902-BE8B-4826-B832-FDA84E9B24C3")]
    3939  public class LinearSolver : ParameterizedNamedItem, ILinearSolver, IDisposable {
    4040
     
    5656
    5757    [StorableConstructor]
    58     protected LinearSolver(bool deserializing)
    59       : base(deserializing) {
    60     }
     58    protected LinearSolver(StorableConstructorFlag _) : base(_) { }
    6159
    6260    protected LinearSolver(LinearSolver original, Cloner cloner)
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/BopSolver.cs

    r16582 r16736  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3131
    3232  [Item("BOP", "BOP (https://developers.google.com/optimization/reference/bop/bop_solver/) can be used out of the box.")]
    33   [StorableClass]
     33  [StorableType("6AE85366-34FC-42C3-B1A3-BFC976CCE830")]
    3434  public class BopSolver : IncrementalLinearSolver {
    3535
     
    4949
    5050    [StorableConstructor]
    51     protected BopSolver(bool deserializing)
    52       : base(deserializing) {
    53     }
     51    protected BopSolver(StorableConstructorFlag _) : base(_) { }
    5452
    5553    protected override Solver.OptimizationProblemType OptimizationProblemType =>
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CoinOrSolver.cs

    r16582 r16736  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2828
    2929  [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   [StorableClass]
     30  [StorableType("53148A15-C754-4CCA-AFAA-200916CDB7F5")]
    3131  public class CoinOrSolver : IncrementalLinearSolver {
    3232
     
    4040
    4141    [StorableConstructor]
    42     protected CoinOrSolver(bool deserializing)
    43       : base(deserializing) {
    44     }
     42    protected CoinOrSolver(StorableConstructorFlag _) : base(_) { }
    4543
    4644    public override bool SupportsPause => false;
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CplexSolver.cs

    r16718 r16736  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3131
    3232  [Item("CPLEX", "CPLEX (https://www.ibm.com/analytics/cplex-optimizer) must be installed and licensed.")]
    33   [StorableClass]
     33  [StorableType("E3478254-F3A8-4085-A9DA-DB79D0A50347")]
    3434  public class CplexSolver : ExternalIncrementalLinearSolver {
    3535
     
    4949
    5050    [StorableConstructor]
    51     protected CplexSolver(bool deserializing)
    52       : base(deserializing) {
    53     }
     51    protected CplexSolver(StorableConstructorFlag _) : base(_) { }
    5452
    5553    protected CplexSolver(CplexSolver original, Cloner cloner)
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlopSolver.cs

    r16718 r16736  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3030
    3131  [Item("Glop", "Glop (https://developers.google.com/optimization/lp/glop) can be used out of the box.")]
    32   [StorableClass]
     32  [StorableType("A05DA123-2779-4175-991E-C4790C5C2E00")]
    3333  public class GlopSolver : IncrementalLinearSolver {
    3434
     
    4444
    4545    [StorableConstructor]
    46     protected GlopSolver(bool deserializing)
    47       : base(deserializing) {
    48     }
     46    protected GlopSolver(StorableConstructorFlag _) : base(_) { }
    4947
    5048    protected GlopSolver(GlopSolver original, Cloner cloner)
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlpkSolver.cs

    r16582 r16736  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3030
    3131  [Item("GLPK", "GLPK (https://www.gnu.org/software/glpk/) can be used out of the box.")]
    32   [StorableClass]
     32  [StorableType("CD1F0577-D68A-483B-8811-17E04573B3F2")]
    3333  public class GlpkSolver : ExternalLinearSolver {
    3434
     
    4444
    4545    [StorableConstructor]
    46     protected GlpkSolver(bool deserializing)
    47       : base(deserializing) {
    48     }
     46    protected GlpkSolver(StorableConstructorFlag _) : base(_) { }
    4947
    5048    public override bool SupportsPause => false;
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GurobiSolver.cs

    r16718 r16736  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3131
    3232  [Item("Gurobi", "Gurobi (http://www.gurobi.com/) must be installed and licensed.")]
    33   [StorableClass]
     33  [StorableType("2C567159-8C09-4B5F-BFF8-D72561686C6B")]
    3434  public class GurobiSolver : ExternalIncrementalLinearSolver {
    3535
     
    5252
    5353    [StorableConstructor]
    54     protected GurobiSolver(bool deserializing)
    55       : base(deserializing) {
    56     }
     54    protected GurobiSolver(StorableConstructorFlag _) : base(_) { }
    5755
    5856    protected override Solver.OptimizationProblemType OptimizationProblemType =>
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/ScipSolver.cs

    r16718 r16736  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3333
    3434  [Item("SCIP", "SCIP (http://scip.zib.de/) must be installed and licensed.")]
    35   [StorableClass]
     35  [StorableType("A4185E0D-25AE-48C4-8136-A764780683D5")]
    3636  public class ScipSolver : ExternalIncrementalLinearSolver {
    3737    private TimeSpan timeLimit = TimeSpan.Zero;
     
    5151
    5252    [StorableConstructor]
    53     protected ScipSolver(bool deserializing)
    54       : base(deserializing) {
    55     }
     53    protected ScipSolver(StorableConstructorFlag _) : base(_) { }
    5654
    5755    protected ScipSolver(ScipSolver original, Cloner cloner)
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/FileBasedLinearProblemDefinition.cs

    r16582 r16736  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3434
    3535  [Item("Linear Problem Definition File (MPS, OR-Tools Protocol Buffers Files)", "File that defines the model for linear/mixed integer programming problem.")]
    36   [StorableClass]
     36  [StorableType("8779D26D-37DB-4595-A4E9-C7F29B870802")]
    3737  public sealed class FileBasedLinearProblemDefinition : ParameterizedNamedItem, ILinearProblemDefinition {
    3838
     
    6363
    6464    [StorableConstructor]
    65     private FileBasedLinearProblemDefinition(bool deserializing) : base(deserializing) { }
     65    private FileBasedLinearProblemDefinition(StorableConstructorFlag _) : base(_) { }
    6666
    6767    public new static Image StaticItemImage => VSImageLibrary.File;
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProblem.cs

    r16582 r16736  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Attic;
    3434
    3535namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3636
    3737  [Item("Mixed-Integer Linear Programming Problem (LP, MIP)", "Represents a linear/mixed integer problem.")]
    38   [StorableClass]
     38  [StorableType("0F6BD4A4-8C70-4922-9BA1-1F372820DD76")]
    3939  public sealed class LinearProblem : Problem, IStorableContent {
    4040
     
    5454
    5555    [StorableConstructor]
    56     private LinearProblem(bool deserializing) : base(deserializing) {
    57     }
     56    private LinearProblem(StorableConstructorFlag _) : base(_) { }
    5857
    5958    public event EventHandler ProblemDefinitionChanged;
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/ProgrammableLinearProblemDefinition.cs

    r16582 r16736  
    2828using HeuristicLab.ExactOptimization.LinearProgramming.Templates;
    2929using HeuristicLab.Optimization;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3130using HeuristicLab.Problems.Programmable;
    3231using HeuristicLab.Scripting;
     32using HEAL.Attic;
    3333
    3434namespace HeuristicLab.ExactOptimization.LinearProgramming {
     
    3636  [Item("Programmable Linear Problem Definition (LP, MIP)",
    3737    "Script that defines the model for a linear/mixed integer programming problem.")]
    38   [StorableClass]
     38  [StorableType("830F82CF-9FF1-4619-A75E-E43E208565F0")]
    3939  public sealed class ProgrammableLinearProblemDefinition : Script, ILinearProblemDefinition,
    4040    IStorableContent {
     
    5656
    5757    [StorableConstructor]
    58     private ProgrammableLinearProblemDefinition(bool deserializing) : base(deserializing) {
    59     }
     58    private ProgrammableLinearProblemDefinition(StorableConstructorFlag _) : base(_) { }
    6059
    6160    private ProgrammableLinearProblemDefinition(ProgrammableLinearProblemDefinition original,
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/Plugin.cs.frame

    r16717 r16736  
    2828  [PluginFile("HeuristicLab.ExactOptimization-3.3.dll", PluginFileType.Assembly)]
    2929  [PluginDependency("HeuristicLab.Analysis", "3.3")]
     30  [PluginDependency("HeuristicLab.Attic", "1.0")]
    3031  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3132  [PluginDependency("HeuristicLab.Common", "3.3")]
     
    3637  [PluginDependency("HeuristicLab.OrTools", "7.0")]
    3738  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    38   [PluginDependency("HeuristicLab.Persistence", "3.3")]
    3939  [PluginDependency("HeuristicLab.Problems.Programmable", "3.3")]
    4040  [PluginDependency("HeuristicLab.Scripting", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.