Changeset 16575
- Timestamp:
- 01/28/19 18:24:59 (6 years ago)
- Location:
- addons/HeuristicLab.Problems.BioBoost
- Files:
-
- 71 edited
Legend:
- Unmodified
- Added
- Removed
-
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost.Views/3.3/HeuristicLab.Problems.BioBoost.Views-3.3.csproj
r15711 r16575 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <Project ToolsVersion=" 4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">2 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <PropertyGroup> 4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> … … 11 11 <RootNamespace>HeuristicLab.Problems.BioBoost.Views</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Problems.BioBoost.Views-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 15 <TargetFrameworkProfile /> … … 133 133 <HintPath>..\..\packages\GeoAPI.1.7.2\lib\net403-client\GeoAPI.dll</HintPath> 134 134 </Reference> 135 <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> 136 <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath> 137 </Reference> 138 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 139 <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath> 140 </Reference> 135 141 <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86"> 136 142 <SpecificVersion>False</SpecificVersion> … … 234 240 </Reference> 235 241 <Reference Include="System.Drawing" /> 242 <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> 243 <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath> 244 </Reference> 236 245 <Reference Include="System.Windows.Forms" /> 237 246 <Reference Include="System.Windows.Forms.DataVisualization" /> -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost.Views/3.3/Properties/Resources.Designer.cs
r13072 r16575 20 20 // To add or remove a member, edit your .ResX file then rerun ResGen 21 21 // with the /str option, or rebuild your VS project. 22 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", " 4.0.0.0")]22 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] 23 23 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 24 24 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost.Views/3.3/RegionDetailData.cs
r13074 r16575 25 25 using HeuristicLab.Data; 26 26 using HeuristicLab.Parameters; 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;28 27 using System; 28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.BioBoost.Views { 31 31 32 [Storable Class]32 [StorableType("47A30E9B-F71A-4469-80FE-20B0978F0119")] 33 33 public class RegionDetailData : ParameterizedNamedItem { 34 34 … … 56 56 57 57 [StorableConstructor] 58 protected RegionDetailData( bool isDeserializing) : base(isDeserializing) {}58 protected RegionDetailData(StorableConstructorFlag _) : base(_) { } 59 59 protected RegionDetailData(RegionDetailData orig, Cloner cloner) : base(orig, cloner) {} 60 60 public RegionDetailData() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost.Views/3.3/packages.config
r13072 r16575 4 4 <package id="Common.Logging" version="2.0.0" targetFramework="net45" /> 5 5 <package id="GeoAPI" version="1.7.2" targetFramework="net45" /> 6 <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" /> 7 <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" /> 6 8 <package id="NetTopologySuite" version="1.13.2" targetFramework="net45" /> 7 9 <package id="NetTopologySuite.IO" version="1.13.2" targetFramework="net45" /> … … 11 13 <package id="SharpMap.UI" version="1.1.0" targetFramework="net45" /> 12 14 <package id="System.Data.SQLite.MSIL" version="1.0.86.0" targetFramework="net45" /> 15 <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" /> 13 16 </packages> -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Analysis/BestBioBoostSolutionAnalyzer.cs
r13071 r16575 31 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 32 using System.Linq; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.BioBoost.Analysis { 35 36 36 37 [Item("BestBioBoostSolutionAnalyzer", "An operator for analyzing the best bioboost solution.")] 37 [Storable Class]38 [StorableType("B6E57285-A990-4675-9BD2-C3D61DF46E96")] 38 39 public class BestBioBoostSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer { 39 40 … … 89 90 #region Construction & Cloning 90 91 [StorableConstructor] 91 protected BestBioBoostSolutionAnalyzer( bool isDeserializing) : base(isDeserializing) {}92 protected BestBioBoostSolutionAnalyzer(StorableConstructorFlag _) : base(_) { } 92 93 protected BestBioBoostSolutionAnalyzer(BestBioBoostSolutionAnalyzer orig, Cloner cloner) : base(orig, cloner) {} 93 94 public BestBioBoostSolutionAnalyzer() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Analysis/MultiObjejctiveBioBoostSolutionAnalyzer.cs
r13071 r16575 33 33 using System.Linq; 34 34 using HeuristicLab.BioBoost.Utils; 35 using HEAL.Attic; 35 36 36 37 namespace HeuristicLab.BioBoost.Analysis { 37 38 38 39 [Item("MultiObjectiveBioBoostSolutionAnalyzer", "An operator for analyzing the set of best bioboost solutions (multi objective).")] 39 [Storable Class]40 [StorableType("FC868394-A817-4835-845C-DD32562AE60C")] 40 41 public class MultiObjectiveBioBoostSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer { 41 42 … … 88 89 #region Construction & Cloning 89 90 [StorableConstructor] 90 protected MultiObjectiveBioBoostSolutionAnalyzer( bool isDeserializing) : base(isDeserializing) {}91 protected MultiObjectiveBioBoostSolutionAnalyzer(StorableConstructorFlag _) : base(_) { } 91 92 protected MultiObjectiveBioBoostSolutionAnalyzer(MultiObjectiveBioBoostSolutionAnalyzer orig, Cloner cloner) : base(orig, cloner) {} 92 93 public MultiObjectiveBioBoostSolutionAnalyzer() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Analysis/MultiOperatorUsageAnalyzer.cs
r13071 r16575 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 30 using System.Linq; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.BioBoost.Analysis { 33 34 34 35 [Item("MultiOperatorUsageAnalyzer", "An operator for analyzing utilization of different choices of a multi manipulation operatoutilization of different choices of a multi manipulation operator.")] 35 [Storable Class]36 [StorableType("4F293561-2390-4B6A-A6E0-8B55807D781C")] 36 37 public class MultiOperatorUsageAnalyzer : SingleSuccessorOperator, IAnalyzer { 37 38 … … 49 50 #region Construction & Cloning 50 51 [StorableConstructor] 51 protected MultiOperatorUsageAnalyzer( bool isDeserializing) : base(isDeserializing) {}52 protected MultiOperatorUsageAnalyzer(StorableConstructorFlag _) : base(_) { } 52 53 protected MultiOperatorUsageAnalyzer(MultiOperatorUsageAnalyzer orig, Cloner cloner) : base(orig, cloner) {} 53 54 public MultiOperatorUsageAnalyzer() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/BioBoostProblem.cs
r13071 r16575 34 34 using System; 35 35 using HeuristicLab.BioBoost.Operators.Moves; 36 using HEAL.Attic; 36 37 37 38 namespace HeuristicLab.BioBoost { … … 41 42 [Item("BioBoost Problem", "EU-wide aggregate biomass logistics simulation.")] 42 43 [Creatable("Problems")] 43 [Storable Class]44 [StorableType("248ABB24-9C03-41FB-816F-C5C47018CB6B")] 44 45 public class BioBoostProblem : SingleObjectiveHeuristicOptimizationProblem<AggregateEvaluator, BioBoostSolutionCreator>, IStorableContent { 45 46 … … 82 83 #region Construction & Cloning 83 84 [StorableConstructor] 84 protected BioBoostProblem( bool isDeserializing) : base(isDeserializing) {}85 protected BioBoostProblem(StorableConstructorFlag _) : base(_) { } 85 86 protected BioBoostProblem(BioBoostProblem orig, Cloner cloner) : base(orig, cloner) { 86 87 RegisterEvents(); -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Data/Conversion.cs
r13071 r16575 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 29 using YamlDotNet.RepresentationModel; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.BioBoost.Data { 32 [Storable Class]33 [StorableType("AFFEC6E6-4373-41FD-B43E-139449409C98")] 33 34 [Item("Conversion", "Describes a conversion process including storage.")] 34 35 public class Conversion : DataItem { … … 141 142 142 143 [StorableConstructor] 143 protected Conversion( bool isDeserializing) : base(isDeserializing) { }144 protected Conversion(StorableConstructorFlag _) : base(_) { } 144 145 145 146 [StorableHook(HookType.AfterDeserialization)] -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Data/CostFactors.cs
r13071 r16575 24 24 using HeuristicLab.Parameters; 25 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.BioBoost.Data { 28 29 29 [Storable Class]30 [StorableType("137AF95F-D154-4EF3-B522-C50BF477A926")] 30 31 [Item("CostFactors", "Splits the cost into several differen areas which can are different for different regions.")] 31 32 public class CostFactors : DataItem { … … 49 50 #region Construction & Cloning 50 51 [StorableConstructor] 51 protected CostFactors( bool isDeserializing) : base(isDeserializing) { }52 protected CostFactors(StorableConstructorFlag _) : base(_) { } 52 53 53 54 protected CostFactors(CostFactors orig, Cloner cloner) : base(orig, cloner) { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Data/DataItem.cs
r13071 r16575 33 33 using System.Text.RegularExpressions; 34 34 using YamlDotNet.RepresentationModel; 35 using HEAL.Attic; 35 36 36 37 namespace HeuristicLab.BioBoost.Data { 37 38 38 [Storable Class]39 [StorableType("ADCB9CD6-ECBD-4202-B945-0602E538D771")] 39 40 [Item("DataItem", "Generic Item for holding various pieces of information")] 40 41 public abstract class DataItem : ParameterizedNamedItem { … … 42 43 #region Construction & Cloning 43 44 [StorableConstructor] 44 protected DataItem( bool isDeserializing) : base(isDeserializing) {}45 protected DataItem(StorableConstructorFlag _) : base(_) { } 45 46 protected DataItem(DataItem orig, Cloner cloner) : base(orig, cloner) {} 46 47 protected DataItem() {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Data/Logistic.cs
r13071 r16575 27 27 using HeuristicLab.Parameters; 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.BioBoost.Data { 31 [Storable Class]32 [StorableType("5604E9F0-F4C5-4C07-BE46-7895ED33A63E")] 32 33 [Item("Logistic", "Describes a logistic modality for a certain product.")] 33 34 public class Logistic : DataItem { … … 73 74 74 75 [StorableConstructor] 75 protected Logistic( bool isDeserializing) : base(isDeserializing) { }76 protected Logistic(StorableConstructorFlag _) : base(_) { } 76 77 77 78 [StorableHook(HookType.AfterDeserialization)] -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Data/LogisticAction.cs
r13071 r16575 25 25 using HeuristicLab.Parameters; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.BioBoost.Data { 29 [Storable Class]30 [StorableType("413F5F16-3342-46CF-93AF-38FDD4F40E92")] 30 31 [Item("LogisticAction", "Summarizes cost factors and emissions for a logistic action.")] 31 32 public class LogisticAction : DataItem { … … 64 65 65 66 [StorableConstructor] 66 protected LogisticAction( bool isDeserializing) : base(isDeserializing) { }67 protected LogisticAction(StorableConstructorFlag _) : base(_) { } 67 68 68 69 protected LogisticAction(LogisticAction orig, Cloner cloner) : base(orig, cloner) { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Data/Product.cs
r13071 r16575 26 26 using HeuristicLab.Parameters; 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.BioBoost.Data { 30 [Storable Class]31 [StorableType("EF528EDA-45D6-4DAB-862A-C05BCD4147CC")] 31 32 [Item("Product", "Summarizes product information.")] 32 33 public class Product : DataItem { … … 71 72 72 73 [StorableConstructor] 73 protected Product( bool isDeserializing) : base(isDeserializing) { }74 protected Product(StorableConstructorFlag _) : base(_) { } 74 75 75 76 [StorableHook(HookType.AfterDeserialization)] -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Evaluators/AggregateEvaluator.cs
r13071 r16575 30 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 31 using System.Collections.Generic; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.BioBoost.Evaluators { 34 [Storable Class]35 [StorableType("5882C8A6-F31E-4EF7-88A7-45D467038686")] 35 36 public class AggregateEvaluator : AlgorithmOperator, IBioBoostSimulationEvaluator { 36 37 … … 80 81 #region Construction & Cloning 81 82 [StorableConstructor] 82 protected AggregateEvaluator( bool isDeserializing) : base(isDeserializing) { }83 protected AggregateEvaluator(StorableConstructorFlag _) : base(_) { } 83 84 protected AggregateEvaluator(AggregateEvaluator orig, Cloner cloner) : base(orig, cloner) { } 84 85 public AggregateEvaluator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Evaluators/BioBoostEvaluator.cs
r13071 r16575 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 29 using System; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.BioBoost.Evaluators { 32 33 33 [Storable Class]34 [StorableType("836CF83B-0123-428F-B953-5B9411D6BB97")] 34 35 public abstract class BioBoostEvaluator : BioBoostOperator { 35 36 … … 54 55 #region Construction & Cloning 55 56 [StorableConstructor] 56 protected BioBoostEvaluator( bool isDeserializing) : base(isDeserializing) {}57 protected BioBoostEvaluator(StorableConstructorFlag _) : base(_) { } 57 58 protected BioBoostEvaluator(BioBoostEvaluator original, Cloner cloner) : base(original, cloner) {} 58 59 protected BioBoostEvaluator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Evaluators/ConcludingEvaluator.cs
r13071 r16575 31 31 using HeuristicLab.BioBoost.Representation; 32 32 using HeuristicLab.BioBoost.Utils; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.BioBoost.Evaluators { 35 [Storable Class]36 [StorableType("C678549A-70FA-4A2F-AEC5-E53D9AC20BFB")] 36 37 public class ConcludingEvaluator : BioBoostEvaluator { 37 38 … … 65 66 #region Construction & Cloning 66 67 [StorableConstructor] 67 protected ConcludingEvaluator( bool isDeserializing) : base(isDeserializing) {}68 protected ConcludingEvaluator(StorableConstructorFlag _) : base(_) { } 68 69 public ConcludingEvaluator() { 69 70 Parameters.Add(new LookupParameter<BoolValue>("RemoveIntermediateResults", "Whether to remove intermediate results created during evaluation.")); -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Evaluators/ConversionCostEvaluator.cs
r13071 r16575 30 30 using System.Linq; 31 31 using HeuristicLab.BioBoost.Representation; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.BioBoost.Evaluators { 34 [Storable Class]35 [StorableType("3DA35F67-F021-475D-B614-FAEAAD66ACF8")] 35 36 [Item("ConversionCostEvaluator", "Simulates the conversion of all applicable conversion processes.")] 36 37 public class ConversionCostEvaluator : BioBoostEvaluator { … … 42 43 #region Construction & Cloning 43 44 [StorableConstructor] 44 protected ConversionCostEvaluator( bool isDeserializing) : base(isDeserializing) {}45 protected ConversionCostEvaluator(StorableConstructorFlag _) : base(_) { } 45 46 protected ConversionCostEvaluator(ConversionCostEvaluator original, Cloner cloner) : base(original, cloner) { } 46 47 public ConversionCostEvaluator() { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Evaluators/FeedstockCostEvaluator.cs
r13071 r16575 28 28 using HeuristicLab.BioBoost.Representation; 29 29 using HeuristicLab.BioBoost.Utils; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.BioBoost.Evaluators { 32 33 33 [Storable Class]34 [StorableType("A2DAA8F7-71AB-48F8-B019-CF14FB34A979")] 34 35 [Item("FeedstockCostEvaluator", @"Calculates all feedstock costs for known products, 35 36 for which both <Product.Label>Potentials and <Product.Label>Utilizations are available. … … 40 41 #region Construction & Cloning 41 42 [StorableConstructor] 42 protected FeedstockCostEvaluator( bool isDeserializing) : base(isDeserializing) { }43 protected FeedstockCostEvaluator(StorableConstructorFlag _) : base(_) { } 43 44 protected FeedstockCostEvaluator(FeedstockCostEvaluator original, Cloner cloner) : base(original, cloner) { } 44 45 public FeedstockCostEvaluator() { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Evaluators/InitializationEvaluator.cs
r13071 r16575 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Common; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.BioBoost.Evaluators { 29 [Storable Class]30 [StorableType("12B3CF5A-6084-4002-99E4-9B730819431C")] 30 31 [Item("InitializationEvaluator", "Cleans up scope.")] 31 32 public class InitializationEvaluator : BioBoostEvaluator { … … 33 34 #region Construction & Cloning 34 35 [StorableConstructor] 35 protected InitializationEvaluator( bool isDeserializing) : base(isDeserializing) {}36 protected InitializationEvaluator(StorableConstructorFlag _) : base(_) { } 36 37 protected InitializationEvaluator(InitializationEvaluator original, Cloner cloner) : base(original, cloner) { } 37 38 public InitializationEvaluator() { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Evaluators/LogisticCostEvaluator.cs
r13071 r16575 31 31 using HeuristicLab.BioBoost.Representation; 32 32 using HeuristicLab.BioBoost.Utils; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.BioBoost.Evaluators { 35 [Storable Class]36 [StorableType("C633F527-7C12-478D-AECA-00D3E54ED2D2")] 36 37 public class LogisticCostEvaluator : BioBoostEvaluator { 37 38 … … 54 55 #region Construction & Cloning 55 56 [StorableConstructor] 56 protected LogisticCostEvaluator( bool isDeserializing) : base(isDeserializing) {}57 protected LogisticCostEvaluator(StorableConstructorFlag _) : base(_) { } 57 58 58 59 protected LogisticCostEvaluator(LogisticCostEvaluator original, Cloner cloner) : base(original, cloner) {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Evaluators/MonolithicEvaluator.cs
r13071 r16575 36 36 using HeuristicLab.Encodings.RealVectorEncoding; 37 37 using HeuristicLab.PluginInfrastructure; 38 using HEAL.Attic; 38 39 39 40 namespace HeuristicLab.BioBoost.Evaluators { 40 [Storable Class]41 [StorableType("0C6D1BC1-3A29-4AA5-A7EB-724BFCA9FD55")] 41 42 public class MonolithicEvaluator : AggregateEvaluator { 42 43 … … 67 68 #region Construction & Cloning 68 69 [StorableConstructor] 69 protected MonolithicEvaluator( bool isDeserializing) : base(isDeserializing) { }70 protected MonolithicEvaluator(StorableConstructorFlag _) : base(_) { } 70 71 protected MonolithicEvaluator(MonolithicEvaluator orig, Cloner cloner) : base(orig, cloner) { } 71 72 public MonolithicEvaluator() { … … 259 260 } 260 261 261 [Storable Class(StorableClassType.AllFieldsAndAllProperties)]262 [StorableType(StorableMemberSelection.AllFieldsAndAllProperties, "7BA4C277-AB0F-4A5F-A5B6-61E661104DCD")] 262 263 public sealed class SimpleProblemData : Item { 263 264 264 265 [StorableConstructor] 265 private SimpleProblemData( bool isDeserializing) : base(isDeserializing) { }266 private SimpleProblemData(StorableConstructorFlag _) : base(_) { } 266 267 267 268 private SimpleProblemData(SimpleProblemData orig, Cloner cloner) : base(orig, cloner) { … … 328 329 } 329 330 330 [Storable Class(StorableClassType.AllFieldsAndAllProperties)]331 [StorableType(StorableMemberSelection.AllFieldsAndAllProperties, "3AE651E8-E056-47A5-9ADA-AE8FD3F8063F")] 331 332 public sealed class Echelon : Item { 332 333 … … 338 339 339 340 [StorableConstructor] 340 private Echelon( bool isDeserializing) : base(isDeserializing) { }341 private Echelon(StorableConstructorFlag _) : base(_) { } 341 342 342 343 public Echelon() { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Evaluators/SinkEvaluator.cs
r13071 r16575 28 28 using System.Linq; 29 29 using HeuristicLab.BioBoost.Representation; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.BioBoost.Evaluators { 32 [Storable Class]33 [StorableType("EB23EA04-FF16-43C0-902D-9DC974F5A246")] 33 34 public class SinkEvaluator : BioBoostEvaluator { 34 35 35 36 #region Construction & Cloning 36 37 [StorableConstructor] 37 protected SinkEvaluator( bool isDeserializing) : base(isDeserializing) {}38 protected SinkEvaluator(StorableConstructorFlag _) : base(_) { } 38 39 protected SinkEvaluator(SinkEvaluator original, Cloner cloner) : base(original, cloner) { } 39 40 public SinkEvaluator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/HeuristicLab.Problems.BioBoost-3.3.csproj
r15711 r16575 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <Project ToolsVersion=" 4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">2 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <PropertyGroup> 4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> … … 11 11 <RootNamespace>HeuristicLab.Problems.BioBoost</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Problems.BioBoost-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 15 <TargetFrameworkProfile /> … … 122 122 <HintPath>..\..\packages\GeoAPI.1.7.2\lib\net403-client\GeoAPI.dll</HintPath> 123 123 </Reference> 124 <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> 125 <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath> 126 </Reference> 127 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 128 <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath> 129 </Reference> 124 130 <Reference Include="HeuristicLab.Analysis-3.3"> 125 131 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath> … … 208 214 </Reference> 209 215 <Reference Include="System.Drawing" /> 216 <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> 217 <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath> 218 </Reference> 210 219 <Reference Include="System.Runtime.Serialization" /> 211 220 <Reference Include="System.Xml.Linq" /> -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/MultiobjectiveBioBoostProblem.cs
r13071 r16575 33 33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 34 34 using System; 35 using HEAL.Attic; 35 36 36 37 namespace HeuristicLab.BioBoost { … … 38 39 [Item("Multiobjective BioBoost Problem", "EU-wide aggregate biomass logistics simulation (multiobjective).")] 39 40 [Creatable("Problems")] 40 [Storable Class]41 [StorableType("1DEF0202-CD83-4310-80FB-751D06A68B7D")] 41 42 public class MultiobjectiveBioBoostProblem : MultiObjectiveHeuristicOptimizationProblem<AggregateEvaluator, BioBoostSolutionCreator>, IStorableContent { 42 43 … … 79 80 #region Construction & Cloning 80 81 [StorableConstructor] 81 protected MultiobjectiveBioBoostProblem( bool isDeserializing) : base(isDeserializing) {}82 protected MultiobjectiveBioBoostProblem(StorableConstructorFlag _) : base(_) { } 82 83 protected MultiobjectiveBioBoostProblem(MultiobjectiveBioBoostProblem orig, Cloner cloner) : base(orig, cloner) { 83 84 RegisterEvents(); -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/BioBoostOperator.cs
r13071 r16575 26 26 using HeuristicLab.Operators; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.BioBoost.Operators { 31 [StorableType("9413703D-B45E-42AF-B2AE-82E6414E3924")] 31 32 public abstract class BioBoostOperator : SingleSuccessorOperator { 32 33 33 34 #region Parameters 34 public ILookupParameter<BioBoostProblemData> ProblemDataParameter { 35 get { return (ILookupParameter<BioBoostProblemData>) Parameters["ProblemData"]; } 35 public ILookupParameter<BioBoostProblemData> ProblemDataParameter 36 { 37 get { return (ILookupParameter<BioBoostProblemData>)Parameters["ProblemData"]; } 36 38 } 37 39 #endregion 38 40 39 41 #region Parameter Values 40 public BioBoostProblemData ProblemData { 42 public BioBoostProblemData ProblemData 43 { 41 44 get { return ProblemDataParameter.ActualValue; } 42 45 } … … 45 48 #region Construction & Cloning 46 49 [StorableConstructor] 47 protected BioBoostOperator( bool isDeserializing) : base(isDeserializing) {}50 protected BioBoostOperator(StorableConstructorFlag _) : base(_) { } 48 51 49 52 protected BioBoostOperator(BioBoostOperator original, Cloner cloner) : base(original, cloner) { } … … 56 59 protected T GetFromProblemData<T>(string label) where T : class, IItem { 57 60 IParameter param; 58 if (LayerDescriptor.PotentialsFromProblemData.IsSuffixOf(label)) {61 if (LayerDescriptor.PotentialsFromProblemData.IsSuffixOf(label)) { 59 62 ProblemData.FeedstockPotentials.TryGetValue(label, out param); 60 63 } else { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Crossover/CompoundCrossover.cs
r13071 r16575 37 37 using SinglePointRealVectorCrossover = HeuristicLab.Encodings.RealVectorEncoding.SinglePointCrossover; 38 38 using SinglePointInteverVectorCrossover = HeuristicLab.Encodings.IntegerVectorEncoding.SinglePointCrossover; 39 using HEAL.Attic; 39 40 40 41 namespace HeuristicLab.BioBoost.Operators.Crossover { 41 [Storable Class]42 [StorableType("DA8F3E29-D4F2-47A9-87DC-051922A528F5")] 42 43 public class CompoundCrossover : SingleSuccessorOperator, ICrossover { 43 44 … … 65 66 #region Construction & Cloning 66 67 [StorableConstructor] 67 protected CompoundCrossover( bool isDeserializing) : base(isDeserializing) {}68 protected CompoundCrossover(StorableConstructorFlag _) : base(_) { } 68 69 protected CompoundCrossover(CompoundCrossover orig, Cloner cloner) : base(orig, cloner) { } 69 70 public CompoundCrossover() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Crossover/MultiCrossover.cs
r13071 r16575 28 28 using HeuristicLab.PluginInfrastructure; 29 29 using System; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.BioBoost.Operators.Mutation { 32 [Storable Class]33 [StorableType("EB607FBE-6802-4915-A3D1-48848E329B5C")] 33 34 public class MultiCrossover : StochasticMultiBranch<ICrossover>, ICrossover, IStochasticOperator { 34 35 … … 43 44 #region Construction & Cloning 44 45 [StorableConstructor] 45 protected MultiCrossover( bool isDeserializing) : base(isDeserializing) {}46 protected MultiCrossover(StorableConstructorFlag _) : base(_) { } 46 47 protected MultiCrossover(MultiCrossover orig, Cloner cloner) : base(orig, cloner) {} 47 48 public MultiCrossover() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Crossover/PlantBasedCrossover.cs
r13071 r16575 42 42 using DiscreteIntegerVectorCrossover = HeuristicLab.Encodings.IntegerVectorEncoding.DiscreteCrossover; 43 43 using DiscreteRealVectorCrossover = HeuristicLab.Encodings.RealVectorEncoding.DiscreteCrossover; 44 using HEAL.Attic; 44 45 45 46 namespace HeuristicLab.BioBoost.Operators.Crossover { 46 [Storable Class]47 [StorableType("D9455201-49C6-4042-8021-CCFD5199B731")] 47 48 public class PlantBasedCrossover : SingleSuccessorOperator, ICrossover, IStochasticOperator { 48 49 … … 70 71 #region Construction & Cloning 71 72 [StorableConstructor] 72 protected PlantBasedCrossover( bool isDeserializing) : base(isDeserializing) { }73 protected PlantBasedCrossover(StorableConstructorFlag _) : base(_) { } 73 74 protected PlantBasedCrossover(PlantBasedCrossover orig, Cloner cloner) : base(orig, cloner) { } 74 75 -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/LimitedDistanceTransportTargetCreator.cs
r13071 r16575 30 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 31 using HeuristicLab.Random; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.BioBoost.Operators { 34 35 35 [Storable Class]36 [StorableType("252FBBAC-C378-4378-B85D-6EB65863F4DF")] 36 37 public class LimitedDistanceTransportTargetCreator : BioBoostOperator, IIntegerVectorCreator { 37 38 … … 59 60 #region Construction & Cloning 60 61 [StorableConstructor] 61 protected LimitedDistanceTransportTargetCreator( bool isDeserializing) : base(isDeserializing) { }62 protected LimitedDistanceTransportTargetCreator(StorableConstructorFlag _) : base(_) { } 62 63 63 64 protected LimitedDistanceTransportTargetCreator(LimitedDistanceTransportTargetCreator orig, Cloner cloner) : base(orig, cloner) {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Moves/MoveEvaluatorAdapter.cs
r13071 r16575 29 29 using HeuristicLab.Parameters; 30 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.BioBoost.Operators.Moves { 33 34 34 [Storable Class]35 [StorableType("01143196-726F-43C7-8F22-BB42D047E113")] 35 36 public class MoveEvaluatorAdapter : SingleSuccessorOperator, ISingleObjectiveMoveEvaluator { 36 37 … … 44 45 45 46 [StorableConstructor] 46 public MoveEvaluatorAdapter( bool isDeserializing) : base(isDeserializing) {}47 public MoveEvaluatorAdapter(StorableConstructorFlag _) : base(_) { } 47 48 48 49 public MoveEvaluatorAdapter(MoveEvaluatorAdapter orig, Cloner cloner) : base(orig, cloner) { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Moves/MoveGeneratorAdapter.cs
r13071 r16575 30 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 31 using HeuristicLab.PluginInfrastructure; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.BioBoost.Operators.Moves { 34 35 35 [Storable Class]36 [StorableType("01CF5EC3-F344-4A73-9BCD-7CE329392552")] 36 37 public class MoveGeneratorAdapter : SingleSuccessorOperator, IMoveGenerator { 37 38 … … 44 45 #region construction & cloning 45 46 [StorableConstructor] 46 public MoveGeneratorAdapter( bool isDeserializing) : base(isDeserializing) { }47 public MoveGeneratorAdapter(StorableConstructorFlag _) : base(_) { } 47 48 48 49 public MoveGeneratorAdapter(MoveGeneratorAdapter orig, Cloner cloner) : base(orig, cloner) { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Moves/MoveMakerAdapter.cs
r13071 r16575 30 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 31 using HeuristicLab.PluginInfrastructure; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.BioBoost.Operators.Moves { 34 35 35 [Storable Class]36 [StorableType("DDE891FB-AA05-4C76-A3AC-AEF8C6A5A2E3")] 36 37 public class MoveMakerAdapter : SingleSuccessorOperator, IMoveMaker { 37 38 … … 41 42 #region construction & cloning 42 43 [StorableConstructor] 43 public MoveMakerAdapter( bool isDeserializing) : base(isDeserializing) { }44 public MoveMakerAdapter(StorableConstructorFlag _) : base(_) { } 44 45 45 46 public MoveMakerAdapter(MoveMakerAdapter orig, Cloner cloner) : base(orig, cloner) { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/BoundaryToggleRealVectorMutator.cs
r13071 r16575 25 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 26 26 using System; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.BioBoost.Operators.Mutation { 29 [Storable Class]30 [StorableType("CC8C60CC-E58C-4FD6-95CA-F310064221AD")] 30 31 public class BoundaryToggleRealVectorMutator : RealVectorManipulator { 31 32 32 33 #region Construction & Cloning 33 34 [StorableConstructor] 34 protected BoundaryToggleRealVectorMutator( bool isDeserializing) : base(isDeserializing) { }35 protected BoundaryToggleRealVectorMutator(StorableConstructorFlag _) : base(_) { } 35 36 protected BoundaryToggleRealVectorMutator(BoundaryToggleRealVectorMutator orig, Cloner cloner) : base(orig, cloner) { } 36 37 public BoundaryToggleRealVectorMutator() { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/CommonTargetIntegerVectorMutator.cs
r13071 r16575 30 30 using System; 31 31 using System.Linq; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.BioBoost.Operators.Mutation { 34 [Storable Class]35 [StorableType("10FB317B-D3BE-47EC-9BED-C7B211927C27")] 35 36 public class CommonTargetIntegerVectorMutator : BoundedIntegerVectorManipulator { 36 37 … … 54 55 #region Construction & Cloning 55 56 [StorableConstructor] 56 protected CommonTargetIntegerVectorMutator( bool isDeserializing) : base(isDeserializing) {}57 protected CommonTargetIntegerVectorMutator(StorableConstructorFlag _) : base(_) { } 57 58 protected CommonTargetIntegerVectorMutator(CommonTargetIntegerVectorMutator orig, Cloner cloner) : base(orig, cloner) {} 58 59 public CommonTargetIntegerVectorMutator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/CommonTargetSwappingIntegerVectorMutator.cs
r13071 r16575 30 30 using System; 31 31 using System.Linq; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.BioBoost.Operators.Mutation { 34 [Storable Class]35 [StorableType("1C259A07-A1BA-46F3-9EE8-DF5EC7EF2C51")] 35 36 public class CommonTargetSwappingIntegerVectorMutator : BoundedIntegerVectorManipulator { 36 37 … … 54 55 #region Construction & Cloning 55 56 [StorableConstructor] 56 protected CommonTargetSwappingIntegerVectorMutator( bool isDeserializing) : base(isDeserializing) {}57 protected CommonTargetSwappingIntegerVectorMutator(StorableConstructorFlag _) : base(_) { } 57 58 protected CommonTargetSwappingIntegerVectorMutator(CommonTargetSwappingIntegerVectorMutator orig, Cloner cloner) : base(orig, cloner) {} 58 59 public CommonTargetSwappingIntegerVectorMutator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/CompoundMutator.cs
r13071 r16575 38 38 using UniformOnePositionManipulator = HeuristicLab.Encodings.IntegerVectorEncoding.UniformOnePositionManipulator; 39 39 using UniformOnePositionRealVectorManipulator = HeuristicLab.Encodings.RealVectorEncoding.UniformOnePositionManipulator; 40 using HEAL.Attic; 40 41 41 42 namespace HeuristicLab.BioBoost.Operators.Mutation { 42 [Storable Class]43 [StorableType("7B7699B9-4D4E-4D27-9DB5-F6F1FC5CBF52")] 43 44 public class CompoundMutator : SingleSuccessorOperator, IManipulator, IStochasticOperator { 44 45 … … 69 70 #region Construction & Cloning 70 71 [StorableConstructor] 71 protected CompoundMutator( bool isDeserializing) : base(isDeserializing) {}72 protected CompoundMutator(StorableConstructorFlag _) : base(_) { } 72 73 protected CompoundMutator(CompoundMutator orig, Cloner cloner) : base(orig, cloner) { } 73 74 public CompoundMutator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/DistanceBasedIntegerVectorMutator.cs
r13071 r16575 29 29 using System; 30 30 using System.Linq; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.BioBoost.Operators.Mutation { 33 [Storable Class]34 [StorableType("37633B84-8BEF-410F-891B-953AD45342AE")] 34 35 public class DistanceBasedIntegerVectorMutator : IntegerVectorManipulator { 35 36 … … 64 65 #region Construction & Cloning 65 66 [StorableConstructor] 66 protected DistanceBasedIntegerVectorMutator( bool isDeserializing) : base(isDeserializing) {}67 protected DistanceBasedIntegerVectorMutator(StorableConstructorFlag _) : base(_) { } 67 68 protected DistanceBasedIntegerVectorMutator(DistanceBasedIntegerVectorMutator orig, Cloner cloner) : base(orig, cloner) {} 68 69 public DistanceBasedIntegerVectorMutator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/EmptyMutator.cs
r13071 r16575 24 24 using HeuristicLab.Optimization; 25 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.BioBoost.Operators.Mutation { 28 29 29 [Storable Class]30 [StorableType("B9929153-331D-4457-9B6D-F0F9AD15BEEC")] 30 31 public class EmptyMutator : SingleSuccessorOperator, IManipulator { 31 32 32 33 #region Construction & Cloning 33 34 [StorableConstructor] 34 protected EmptyMutator( bool isDeserializing) : base(isDeserializing) {}35 protected EmptyMutator(StorableConstructorFlag _) : base(_) { } 35 36 protected EmptyMutator(EmptyMutator orig, Cloner cloner) : base(orig, cloner) {} 36 37 public EmptyMutator() {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/MultiIntegerVectorMutator.cs
r13071 r16575 32 32 using System; 33 33 using System.Linq; 34 using HEAL.Attic; 34 35 35 36 namespace HeuristicLab.BioBoost.Operators.Mutation { 36 [Storable Class]37 [StorableType("3655B281-9061-470B-95B5-378D9490E814")] 37 38 public class MultiIntegerVectorManipulator : StochasticMultiBranch<IIntegerVectorManipulator>, IIntegerVectorManipulator, IStochasticOperator { 38 39 … … 54 55 #region Construction & Cloning 55 56 [StorableConstructor] 56 protected MultiIntegerVectorManipulator( bool isDeserializing) : base(isDeserializing) {}57 protected MultiIntegerVectorManipulator(StorableConstructorFlag _) : base(_) { } 57 58 protected MultiIntegerVectorManipulator(MultiIntegerVectorManipulator orig, Cloner cloner) : base(orig, cloner) {} 58 59 public MultiIntegerVectorManipulator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/MultiMutator.cs
r13071 r16575 34 34 using System.Collections.Generic; 35 35 using System.Linq; 36 using HEAL.Attic; 36 37 37 38 namespace HeuristicLab.BioBoost.Operators.Mutation { 38 [Storable Class]39 [StorableType("4051852F-E6DA-45A6-A63B-E62FA18D9D3E")] 39 40 public class MultiMutator : StochasticMultiBranch<IManipulator>, IManipulator, IStochasticOperator { 40 41 … … 56 57 #region Construction & Cloning 57 58 [StorableConstructor] 58 protected MultiMutator( bool isDeserializing) : base(isDeserializing) { }59 protected MultiMutator(StorableConstructorFlag _) : base(_) { } 59 60 protected MultiMutator(MultiMutator orig, Cloner cloner) : base(orig, cloner) { } 60 61 public MultiMutator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/NeighborBasedIntegerVectorMutator.cs
r13071 r16575 27 27 using HeuristicLab.Parameters; 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.BioBoost.Operators.Mutation { 31 [Storable Class]32 [StorableType("CD4B0E31-C2A7-430D-B397-65ADCB75691A")] 32 33 public class NeighborBasedIntegerVectorMutator : BoundedIntegerVectorManipulator { 33 34 … … 42 43 #region Construction & Cloning 43 44 [StorableConstructor] 44 protected NeighborBasedIntegerVectorMutator( bool isDeserializing) : base(isDeserializing) {}45 protected NeighborBasedIntegerVectorMutator(StorableConstructorFlag _) : base(_) { } 45 46 protected NeighborBasedIntegerVectorMutator(NeighborBasedIntegerVectorMutator orig, Cloner cloner) : base(orig, cloner) {} 46 47 public NeighborBasedIntegerVectorMutator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantBasedUtilizationModifier.cs
r13071 r16575 34 34 using HeuristicLab.Parameters; 35 35 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 36 using HEAL.Attic; 36 37 37 38 namespace HeuristicLab.BioBoost.Operators.Mutation { 38 [Storable Class]39 [StorableType("67144EAD-755F-4727-A7C9-8BB312E13DBA")] 39 40 public abstract class PlantBasedUtilizationModifier : SingleSuccessorOperator, IManipulator, IStochasticOperator { 40 41 … … 66 67 67 68 [StorableConstructor] 68 public PlantBasedUtilizationModifier( bool isDeserializing) {}69 public PlantBasedUtilizationModifier(StorableConstructorFlag _) { } 69 70 public PlantBasedUtilizationModifier(PlantBasedUtilizationModifier orig, Cloner cloner) : base(orig, cloner) {} 70 71 public PlantBasedUtilizationModifier() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantKiller.cs
r13071 r16575 24 24 using HeuristicLab.Encodings.RealVectorEncoding; 25 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.BioBoost.Operators.Mutation { 28 29 [StorableType("C6022D30-973A-44A9-ABDF-EE3D7B20B6E3")] 29 30 public class PlantKiller : PlantBasedUtilizationModifier { 30 31 31 32 #region Construction & Cloning 32 33 [StorableConstructor] 33 public PlantKiller( bool isDeserializing) {}34 public PlantKiller(PlantKiller orig, Cloner cloner) : base(orig, cloner) { }35 public PlantKiller() { }34 public PlantKiller(StorableConstructorFlag _) : base(_) { } 35 public PlantKiller(PlantKiller orig, Cloner cloner) : base(orig, cloner) { } 36 public PlantKiller() { } 36 37 public override IDeepCloneable Clone(Cloner cloner) { 37 38 return new PlantKiller(this, cloner); -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantMerger.cs
r13071 r16575 33 33 using HeuristicLab.Parameters; 34 34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 35 using HEAL.Attic; 35 36 36 37 namespace HeuristicLab.BioBoost.Operators.Mutation { 37 38 [StorableType("F3ADEDCA-B790-4892-896D-90AB5E833223")] 38 39 public class PlantMerger : SingleSuccessorOperator, IManipulator, IStochasticOperator { 39 40 40 41 #region Parameters 41 public LookupParameter<BioBoostProblemData> ProblemDataParameter { get { return (LookupParameter<BioBoostProblemData>) 42 public LookupParameter<DistanceMatrix> DistanceMatrixParameter { get { return (LookupParameter<DistanceMatrix>) 43 public ValueParameter<BoolValue> DistanceMatrixInProblemDataParameter { get { return (ValueParameter<BoolValue>) 44 public ValueLookupParameter<IntMatrix> RegionBoundsParameter { get { return (ValueLookupParameter<IntMatrix>) Parameters["RegionBounds"]; } }45 public ILookupParameter<IRandom> RandomParameter { get { return (ILookupParameter<IRandom>) 42 public LookupParameter<BioBoostProblemData> ProblemDataParameter { get { return (LookupParameter<BioBoostProblemData>)Parameters["ProblemData"]; } } 43 public LookupParameter<DistanceMatrix> DistanceMatrixParameter { get { return (LookupParameter<DistanceMatrix>)Parameters["DistanceMatrix"]; } } 44 public ValueParameter<BoolValue> DistanceMatrixInProblemDataParameter { get { return (ValueParameter<BoolValue>)Parameters["DistanceMatrixInProblemData"]; } } 45 public ValueLookupParameter<IntMatrix> RegionBoundsParameter { get { return (ValueLookupParameter<IntMatrix>)Parameters["RegionBounds"]; } } 46 public ILookupParameter<IRandom> RandomParameter { get { return (ILookupParameter<IRandom>)Parameters["Random"]; } } 46 47 #endregion 47 48 … … 51 52 public IRandom Random { get { return RandomParameter.ActualValue; } } 52 53 public bool DistanceMatrixInProblemData { get { return DistanceMatrixInProblemDataParameter.Value.Value; } } 53 public DistanceMatrix DistanceMatrix { 54 public DistanceMatrix DistanceMatrix 55 { 54 56 get { 55 57 if (DistanceMatrixInProblemData) { 56 return ((IValueParameter<DistanceMatrix>) 58 return ((IValueParameter<DistanceMatrix>)ProblemData.Parameters[DistanceMatrixParameter.ActualName]).Value; 57 59 } else { 58 60 return DistanceMatrixParameter.ActualValue; … … 64 66 #region Construction & Cloning 65 67 [StorableConstructor] 66 public PlantMerger( bool isDeserializing) {}67 public PlantMerger(PlantMerger orig, Cloner cloner) : base(orig, cloner) { }68 public PlantMerger(StorableConstructorFlag _) : base(_) { } 69 public PlantMerger(PlantMerger orig, Cloner cloner) : base(orig, cloner) { } 68 70 69 71 public PlantMerger() { … … 97 99 : scope.Variables[productTransportName].Value as IntegerVector; 98 100 if (supplyTransports != null) { 99 var plants = supplyTransports.Select((target, source) => new { target, source}).GroupBy(p => p.target).ToList();101 var plants = supplyTransports.Select((target, source) => new { target, source }).GroupBy(p => p.target).ToList(); 100 102 var plant = plants.ElementAt(Random.Next(plants.Count)); 101 103 var allowedRegions = new HashSet<int>(plants.Select(p => p.Key)); … … 114 116 115 117 private int FindNewTarget(int oldTarget, IRandom random, DistanceMatrix distances, IEnumerable<int> allowedRegions) { 116 var neighborDistances = new double[0].Select((d, idx) => new { index = idx, distance = d}).ToList();118 var neighborDistances = new double[0].Select((d, idx) => new { index = idx, distance = d }).ToList(); 117 119 var maxDistance = 0d; 118 120 foreach (int j in allowedRegions) { 119 121 var dist = distances[oldTarget, j]; 120 neighborDistances.Add(new { index = j, distance = dist});122 neighborDistances.Add(new { index = j, distance = dist }); 121 123 maxDistance = Math.Max(dist, maxDistance); 122 124 } 123 neighborDistances = neighborDistances.Select(p => new { p.index, distance = maxDistance - p.distance}).ToList();125 neighborDistances = neighborDistances.Select(p => new { p.index, distance = maxDistance - p.distance }).ToList(); 124 126 neighborDistances.Sort((a, b) => b.distance.CompareTo(a.distance)); 125 127 var totalDistance = neighborDistances.Sum(p => p.distance); 126 var threshold = random.NextDouble() *totalDistance;128 var threshold = random.NextDouble() * totalDistance; 127 129 var sum = 0d; 128 130 var index = 0; -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantMover.cs
r13071 r16575 33 33 using HeuristicLab.Parameters; 34 34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 35 using HEAL.Attic; 35 36 36 37 namespace HeuristicLab.BioBoost.Operators.Mutation { 37 38 [StorableType("E7D81182-EFE9-4581-B26D-15FF2354B4C6")] 38 39 public class PlantMover : SingleSuccessorOperator, IManipulator, IStochasticOperator { 39 40 40 41 #region Parameters 41 public LookupParameter<BioBoostProblemData> ProblemDataParameter { get { return (LookupParameter<BioBoostProblemData>) 42 public LookupParameter<DistanceMatrix> DistanceMatrixParameter { get { return (LookupParameter<DistanceMatrix>) 43 public ValueParameter<BoolValue> DistanceMatrixInProblemDataParameter { get { return (ValueParameter<BoolValue>) 44 public ValueLookupParameter<IntMatrix> RegionBoundsParameter { get { return (ValueLookupParameter<IntMatrix>) Parameters["RegionBounds"]; } }45 public ILookupParameter<IRandom> RandomParameter { get { return (ILookupParameter<IRandom>) 46 public IValueLookupParameter<PercentValue> MergeAvoidanceProbabilityParameter { get { return (IValueLookupParameter<PercentValue>) 47 public IValueLookupParameter<PercentValue> SplitProbabilityParameter { get { return (IValueLookupParameter<PercentValue>) 48 public IValueLookupParameter<PercentValue> MovePercentageParameter { get { return (IValueLookupParameter<PercentValue>) 42 public LookupParameter<BioBoostProblemData> ProblemDataParameter { get { return (LookupParameter<BioBoostProblemData>)Parameters["ProblemData"]; } } 43 public LookupParameter<DistanceMatrix> DistanceMatrixParameter { get { return (LookupParameter<DistanceMatrix>)Parameters["DistanceMatrix"]; } } 44 public ValueParameter<BoolValue> DistanceMatrixInProblemDataParameter { get { return (ValueParameter<BoolValue>)Parameters["DistanceMatrixInProblemData"]; } } 45 public ValueLookupParameter<IntMatrix> RegionBoundsParameter { get { return (ValueLookupParameter<IntMatrix>)Parameters["RegionBounds"]; } } 46 public ILookupParameter<IRandom> RandomParameter { get { return (ILookupParameter<IRandom>)Parameters["Random"]; } } 47 public IValueLookupParameter<PercentValue> MergeAvoidanceProbabilityParameter { get { return (IValueLookupParameter<PercentValue>)Parameters["MergeAvoidanceProbability"]; } } 48 public IValueLookupParameter<PercentValue> SplitProbabilityParameter { get { return (IValueLookupParameter<PercentValue>)Parameters["SplitProbability"]; } } 49 public IValueLookupParameter<PercentValue> MovePercentageParameter { get { return (IValueLookupParameter<PercentValue>)Parameters["MovePercentage"]; } } 49 50 #endregion 50 51 … … 56 57 public IRandom Random { get { return RandomParameter.ActualValue; } } 57 58 public bool DistanceMatrixInProblemData { get { return DistanceMatrixInProblemDataParameter.Value.Value; } } 58 public DistanceMatrix DistanceMatrix { 59 public DistanceMatrix DistanceMatrix 60 { 59 61 get { 60 62 if (DistanceMatrixInProblemData) { 61 return ((IValueParameter<DistanceMatrix>) 63 return ((IValueParameter<DistanceMatrix>)ProblemData.Parameters[DistanceMatrixParameter.ActualName]).Value; 62 64 } else { 63 65 return DistanceMatrixParameter.ActualValue; … … 72 74 #region Construction & Cloning 73 75 [StorableConstructor] 74 public PlantMover( bool isDeserializing) {}75 public PlantMover(PlantMover orig, Cloner cloner) : base(orig, cloner) { }76 public PlantMover(StorableConstructorFlag _) : base(_) { } 77 public PlantMover(PlantMover orig, Cloner cloner) : base(orig, cloner) { } 76 78 77 79 public PlantMover() { … … 108 110 : scope.Variables[productTransportName].Value as IntegerVector; 109 111 if (supplyTransports != null) { 110 var plants = supplyTransports.Select((target, source) => new { target, source}).GroupBy(p => p.target).ToList();112 var plants = supplyTransports.Select((target, source) => new { target, source }).GroupBy(p => p.target).ToList(); 111 113 var plant = plants.ElementAt(Random.Next(plants.Count)); 112 114 var forbiddenRegions = new HashSet<int>(); … … 131 133 132 134 private int FindNewTarget(int oldTarget, IRandom random, DistanceMatrix distances, HashSet<int> forbiddenRegions) { 133 var neighborDistances = new double[0].Select((d, idx) => new { index = idx, distance = d}).ToList();135 var neighborDistances = new double[0].Select((d, idx) => new { index = idx, distance = d }).ToList(); 134 136 var maxDistance = 0d; 135 137 for (int j = 0; j < distances.Columns; j++) { 136 138 if (forbiddenRegions.Contains(j)) continue; 137 139 var dist = distances[oldTarget, j]; 138 neighborDistances.Add(new { index = j, distance = dist});140 neighborDistances.Add(new { index = j, distance = dist }); 139 141 maxDistance = Math.Max(dist, maxDistance); 140 142 } 141 neighborDistances = neighborDistances.Select(p => new { p.index, distance = maxDistance - p.distance}).ToList();143 neighborDistances = neighborDistances.Select(p => new { p.index, distance = maxDistance - p.distance }).ToList(); 142 144 neighborDistances.Sort((a, b) => b.distance.CompareTo(a.distance)); 143 145 var totalDistance = neighborDistances.Sum(p => p.distance); 144 var threshold = random.NextDouble() *totalDistance;146 var threshold = random.NextDouble() * totalDistance; 145 147 var sum = 0d; 146 148 var index = 0; -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantScalingMutator.cs
r13071 r16575 25 25 using HeuristicLab.Encodings.RealVectorEncoding; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.BioBoost.Operators.Mutation { 29 30 30 [Storable Class]31 [StorableType("01EBA7E4-DBAE-47F9-8DE6-C3D3E697CD11")] 31 32 public class PlantScalingMutator : PlantBasedUtilizationModifier { 32 33 33 34 #region Construction & Cloning 34 35 [StorableConstructor] 35 public PlantScalingMutator( bool isDeserializing) {}36 public PlantScalingMutator(StorableConstructorFlag _) { } 36 37 public PlantScalingMutator(PlantScalingMutator orig, Cloner cloner) : base(orig, cloner) {} 37 38 public PlantScalingMutator() {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantSplitter.cs
r13071 r16575 33 33 using HeuristicLab.Parameters; 34 34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 35 using HEAL.Attic; 35 36 36 37 namespace HeuristicLab.BioBoost.Operators.Mutation { 37 38 [StorableType("FCC0115E-1465-4C76-A422-E9242B3AB8CA")] 38 39 public class PlantSplitter : SingleSuccessorOperator, IManipulator, IStochasticOperator { 39 40 40 41 #region Parameters 41 public LookupParameter<BioBoostProblemData> ProblemDataParameter { get { return (LookupParameter<BioBoostProblemData>) 42 public LookupParameter<DistanceMatrix> DistanceMatrixParameter { get { return (LookupParameter<DistanceMatrix>) 43 public ValueParameter<BoolValue> DistanceMatrixInProblemDataParameter { get { return (ValueParameter<BoolValue>) 44 public ValueLookupParameter<IntMatrix> RegionBoundsParameter { get { return (ValueLookupParameter<IntMatrix>) Parameters["RegionBounds"]; } }45 public ILookupParameter<IRandom> RandomParameter { get { return (ILookupParameter<IRandom>) 46 public IValueLookupParameter<PercentValue> MergeAvoidanceProbabilityParameter { get { return (IValueLookupParameter<PercentValue>) 47 public IValueLookupParameter<PercentValue> SplitProbabilityParameter { get { return (IValueLookupParameter<PercentValue>) 48 public IValueLookupParameter<PercentValue> MovePercentageParameter { get { return (IValueLookupParameter<PercentValue>) 42 public LookupParameter<BioBoostProblemData> ProblemDataParameter { get { return (LookupParameter<BioBoostProblemData>)Parameters["ProblemData"]; } } 43 public LookupParameter<DistanceMatrix> DistanceMatrixParameter { get { return (LookupParameter<DistanceMatrix>)Parameters["DistanceMatrix"]; } } 44 public ValueParameter<BoolValue> DistanceMatrixInProblemDataParameter { get { return (ValueParameter<BoolValue>)Parameters["DistanceMatrixInProblemData"]; } } 45 public ValueLookupParameter<IntMatrix> RegionBoundsParameter { get { return (ValueLookupParameter<IntMatrix>)Parameters["RegionBounds"]; } } 46 public ILookupParameter<IRandom> RandomParameter { get { return (ILookupParameter<IRandom>)Parameters["Random"]; } } 47 public IValueLookupParameter<PercentValue> MergeAvoidanceProbabilityParameter { get { return (IValueLookupParameter<PercentValue>)Parameters["MergeAvoidanceProbability"]; } } 48 public IValueLookupParameter<PercentValue> SplitProbabilityParameter { get { return (IValueLookupParameter<PercentValue>)Parameters["SplitProbability"]; } } 49 public IValueLookupParameter<PercentValue> MovePercentageParameter { get { return (IValueLookupParameter<PercentValue>)Parameters["MovePercentage"]; } } 49 50 #endregion 50 51 … … 54 55 public IRandom Random { get { return RandomParameter.ActualValue; } } 55 56 public bool DistanceMatrixInProblemData { get { return DistanceMatrixInProblemDataParameter.Value.Value; } } 56 public DistanceMatrix DistanceMatrix { 57 public DistanceMatrix DistanceMatrix 58 { 57 59 get { 58 60 if (DistanceMatrixInProblemData) { 59 return ((IValueParameter<DistanceMatrix>) 61 return ((IValueParameter<DistanceMatrix>)ProblemData.Parameters[DistanceMatrixParameter.ActualName]).Value; 60 62 } else { 61 63 return DistanceMatrixParameter.ActualValue; … … 70 72 #region Construction & Cloning 71 73 [StorableConstructor] 72 public PlantSplitter( bool isDeserializing) {}73 public PlantSplitter(PlantSplitter orig, Cloner cloner) : base(orig, cloner) { }74 public PlantSplitter(StorableConstructorFlag _) : base(_) { } 75 public PlantSplitter(PlantSplitter orig, Cloner cloner) : base(orig, cloner) { } 74 76 75 77 public PlantSplitter() { … … 106 108 : scope.Variables[productTransportName].Value as IntegerVector; 107 109 if (supplyTransports != null) { 108 var plants = supplyTransports.Select((target, source) => new { target, source}).GroupBy(p => p.target).ToList();110 var plants = supplyTransports.Select((target, source) => new { target, source }).GroupBy(p => p.target).ToList(); 109 111 var plant = plants.ElementAt(Random.Next(plants.Count)); 110 112 var forbiddenRegions = new HashSet<int>(); … … 129 131 130 132 private int FindNewTarget(int oldTarget, IRandom random, DistanceMatrix distances, HashSet<int> forbiddenRegions) { 131 var neighborDistances = new double[0].Select((d, idx) => new { index = idx, distance = d}).ToList();133 var neighborDistances = new double[0].Select((d, idx) => new { index = idx, distance = d }).ToList(); 132 134 var maxDistance = 0d; 133 135 for (int j = 0; j < distances.Columns; j++) { 134 136 if (forbiddenRegions.Contains(j)) continue; 135 137 var dist = distances[oldTarget, j]; 136 neighborDistances.Add(new { index = j, distance = dist});138 neighborDistances.Add(new { index = j, distance = dist }); 137 139 maxDistance = Math.Max(dist, maxDistance); 138 140 } 139 neighborDistances = neighborDistances.Select(p => new { p.index, distance = maxDistance - p.distance}).ToList();141 neighborDistances = neighborDistances.Select(p => new { p.index, distance = maxDistance - p.distance }).ToList(); 140 142 neighborDistances.Sort((a, b) => b.distance.CompareTo(a.distance)); 141 143 var totalDistance = neighborDistances.Sum(p => p.distance); 142 var threshold = random.NextDouble() *totalDistance;144 var threshold = random.NextDouble() * totalDistance; 143 145 var sum = 0d; 144 146 var index = 0; -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantSupplierEqualizer.cs
r13071 r16575 25 25 using HeuristicLab.Encodings.RealVectorEncoding; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.BioBoost.Operators.Mutation { 29 30 30 [Storable Class]31 [StorableType("47E3AE56-1831-4FD4-8F6A-AAEED5AF0F5A")] 31 32 public class PlantSupplierEqualizer : PlantBasedUtilizationModifier { 32 33 33 34 #region Construction & Cloning 34 35 [StorableConstructor] 35 public PlantSupplierEqualizer( bool isDeserializing) {}36 public PlantSupplierEqualizer(StorableConstructorFlag _) { } 36 37 public PlantSupplierEqualizer(PlantSupplierEqualizer orig, Cloner cloner) : base(orig, cloner) {} 37 38 public PlantSupplierEqualizer() {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantSupplierRandomizer.cs
r13071 r16575 25 25 using HeuristicLab.Encodings.RealVectorEncoding; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.BioBoost.Operators.Mutation { 29 30 30 [Storable Class]31 [StorableType("234006BF-3E6B-4493-A318-95325A72CB5F")] 31 32 public class PlantSupplierRandomizer : PlantBasedUtilizationModifier { 32 33 33 34 #region Construction & Cloning 34 35 [StorableConstructor] 35 public PlantSupplierRandomizer( bool isDeserializing) {}36 public PlantSupplierRandomizer(StorableConstructorFlag _) { } 36 37 public PlantSupplierRandomizer(PlantSupplierRandomizer orig, Cloner cloner) : base(orig, cloner) {} 37 38 public PlantSupplierRandomizer() {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantSupplierToggler.cs
r13071 r16575 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 27 using HeuristicLab.Random; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.BioBoost.Operators.Mutation { 30 31 31 [Storable Class]32 [StorableType("ED5F9402-0524-429E-BDD5-F6B1753B7B47")] 32 33 public class PlantSupplierToggler : PlantBasedUtilizationModifier { 33 34 34 35 #region Construction & Cloning 35 36 [StorableConstructor] 36 public PlantSupplierToggler( bool isDeserializing) {}37 public PlantSupplierToggler(StorableConstructorFlag _) { } 37 38 public PlantSupplierToggler(PlantSupplierToggler orig, Cloner cloner) : base(orig, cloner) {} 38 39 public PlantSupplierToggler() {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/PlantSupplierUtilizationExchanger.cs
r13071 r16575 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 27 using HeuristicLab.Random; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.BioBoost.Operators.Mutation { 30 31 31 [Storable Class]32 [StorableType("F68106A0-10E6-457B-9318-4A6AF242BC8E")] 32 33 public class PlantSupplierUtilizationExchanger : PlantBasedUtilizationModifier { 33 34 34 35 #region Construction & Cloning 35 36 [StorableConstructor] 36 public PlantSupplierUtilizationExchanger( bool isDeserializing) {}37 public PlantSupplierUtilizationExchanger(StorableConstructorFlag _) { } 37 38 public PlantSupplierUtilizationExchanger(PlantSupplierUtilizationExchanger orig, Cloner cloner) : base(orig, cloner) {} 38 39 public PlantSupplierUtilizationExchanger() {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Mutation/TargetMergingIntegerVectorMutator.cs
r13071 r16575 30 30 using System; 31 31 using System.Linq; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.BioBoost.Operators.Mutation { 34 [Storable Class]35 [StorableType("EE0CB71C-2631-445E-BFBF-55967F4D371E")] 35 36 public class TargetMergingIntegerVectorManipulator : BoundedIntegerVectorManipulator { 36 37 … … 67 68 #region Construction & Cloning 68 69 [StorableConstructor] 69 protected TargetMergingIntegerVectorManipulator( bool isDeserializing) : base(isDeserializing) {}70 protected TargetMergingIntegerVectorManipulator(StorableConstructorFlag _) : base(_) { } 70 71 protected TargetMergingIntegerVectorManipulator(TargetMergingIntegerVectorManipulator orig, Cloner cloner) : base(orig, cloner) {} 71 72 public TargetMergingIntegerVectorManipulator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Transformation/FeedstockDeflater.cs
r13071 r16575 31 31 using System.Collections.Generic; 32 32 using HeuristicLab.BioBoost.Representation; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.BioBoost.Operators.Transformation { 35 36 36 [Storable Class]37 [StorableType("9F8B4BC5-5814-45C2-8AEC-AC29CBA40A05")] 37 38 public class FeedstockDeflater : FeedstockTransformer { 38 39 … … 45 46 #region Construction & Cloning 46 47 [StorableConstructor] 47 protected FeedstockDeflater( bool isDeserializing) : base(isDeserializing) {}48 protected FeedstockDeflater(StorableConstructorFlag _) : base(_) { } 48 49 protected FeedstockDeflater(FeedstockDeflater orig, Cloner cloner) : base(orig, cloner) {} 49 50 public FeedstockDeflater() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Transformation/FeedstockInflater.cs
r13071 r16575 27 27 using System.Collections.Generic; 28 28 using HeuristicLab.BioBoost.Representation; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.BioBoost.Operators.Transformation { 31 32 32 [Storable Class]33 [StorableType("6BC1D076-7DFC-4AC9-B5CF-35BE9DB903F6")] 33 34 public class FeedstockInflater : FeedstockTransformer { 34 35 35 36 #region Construction & Cloning 36 37 [StorableConstructor] 37 protected FeedstockInflater( bool isDeserializing) : base(isDeserializing) {}38 protected FeedstockInflater(StorableConstructorFlag _) : base(_) { } 38 39 protected FeedstockInflater(FeedstockInflater orig, Cloner cloner) : base(orig, cloner) {} 39 40 public FeedstockInflater() {} -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Operators/Transformation/FeedstockTransformer.cs
r13071 r16575 25 25 using HeuristicLab.Parameters; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.BioBoost.Operators.Transformation { 29 30 30 [Storable Class]31 [StorableType("4899F5B6-FD69-4CAA-896C-20A51A4B0BCC")] 31 32 public class FeedstockTransformer : BioBoostOperator { 32 33 … … 41 42 #region Construction & Cloning 42 43 [StorableConstructor] 43 protected FeedstockTransformer( bool isDeserializing) : base(isDeserializing) {}44 protected FeedstockTransformer(StorableConstructorFlag _) : base(_) { } 44 45 protected FeedstockTransformer(FeedstockTransformer orig, Cloner cloner) : base(orig, cloner) {} 45 46 public FeedstockTransformer() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Persistence/GeometryFeatureProviderSerializer.cs
r13071 r16575 21 21 22 22 using GeoAPI.Geometries; 23 using HEAL.Attic; 23 24 using HeuristicLab.Persistence.Core; 24 25 using HeuristicLab.Persistence.Interfaces; -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/ProblemDescription/BioBoostProblemData.cs
r13071 r16575 41 41 using GeoAPI.Geometries; 42 42 using HeuristicLab.BioBoost.Representation; 43 using HEAL.Attic; 43 44 44 45 namespace HeuristicLab.BioBoost.ProblemDescription { 45 46 46 [Storable Class]47 [StorableType("1A6A5B9A-0E82-4873-9F8F-87ABA1D8F125")] 47 48 public class BioBoostProblemData : ParameterizedNamedItem { 48 49 … … 185 186 186 187 [StorableConstructor] 187 protected BioBoostProblemData( bool isDeserializing) : base(isDeserializing) { }188 protected BioBoostProblemData(StorableConstructorFlag _) : base(_) { } 188 189 protected BioBoostProblemData(BioBoostProblemData orig, Cloner cloner) 189 190 : base(orig, cloner) { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/ProblemDescription/DistanceMatrix.cs
r13071 r16575 29 29 using System.Globalization; 30 30 using System.Linq; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.BioBoost.ProblemDescription { 33 34 34 35 [Item("DistanceMatrix", "Represents a space-efficient, symmetric distance matrix of double values.")] 35 [Storable Class]36 [StorableType("108ABFA4-9CA2-43B5-850A-3B3F13BC271A")] 36 37 public class DistanceMatrix : NamedItem, IStringConvertibleMatrix { 37 38 … … 59 60 #region Construction & Cloning 60 61 [StorableConstructor] 61 protected DistanceMatrix( bool isDeserializing) : base(isDeserializing) { }62 protected DistanceMatrix(StorableConstructorFlag _) : base(_) { } 62 63 protected DistanceMatrix(DistanceMatrix original, Cloner cloner) 63 64 : base(original, cloner) { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/ProblemDescription/NeighborhoodTable.cs
r13071 r16575 28 28 using System.Globalization; 29 29 using System.Linq; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.BioBoost.ProblemDescription { 32 33 33 [Storable Class]34 [StorableType("F7026CD3-DA57-4AEE-8AB7-F93BDFCE3CDE")] 34 35 public class NeighborhoodTable : Item, IStringConvertibleMatrix { 35 36 … … 62 63 #region Construction & Cloning 63 64 [StorableConstructor] 64 protected NeighborhoodTable( bool isDeserializing) : base(isDeserializing) {}65 protected NeighborhoodTable(StorableConstructorFlag _) : base(_) { } 65 66 protected NeighborhoodTable(NeighborhoodTable orig, Cloner cloner) : base(orig, cloner) { 66 67 table = orig.table.ToDictionary(p => p.Key, p => p.Value); -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Representation/BioBoostCompoundSolution.cs
r13075 r16575 41 41 using SharpMap.Layers; 42 42 using SharpMap.Utilities.Wfs; 43 using HEAL.Attic; 43 44 // using YamlDotNet.RepresentationModel.Serialization.NodeTypeResolvers; 44 45 45 46 namespace HeuristicLab.BioBoost.Representation { 46 [Storable Class]47 [StorableType("644945D8-CC1B-4DE9-AF2E-4C6DE95A37FD")] 47 48 public sealed class BioBoostCompoundSolution : ParameterizedNamedItem, IStorableContent { 48 49 public class TransportInfo { … … 135 136 #region Construction & Cloning 136 137 [StorableConstructor] 137 private BioBoostCompoundSolution( bool isDeserializing) : base(isDeserializing) { }138 private BioBoostCompoundSolution(StorableConstructorFlag _) : base(_) { } 138 139 private BioBoostCompoundSolution(BioBoostCompoundSolution orig, Cloner cloner, bool full = true) 139 140 : base(orig, cloner) { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Representation/LayerDescriptor.cs
r13071 r16575 28 28 using HeuristicLab.Data; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.BioBoost.Representation { 32 33 [StorableType("9464112A-FE8E-43C0-A6F9-5626D63D2D30")] 33 34 public interface ILayerDescriptor : IItem { 34 35 string Name { get; } … … 39 40 } 40 41 42 [StorableType("D6229284-9C48-4FE9-B37F-34FA96B9FC55")] 41 43 public interface IValueLayer { 42 44 LayerDescriptor LayerDescriptor { get; } … … 44 46 } 45 47 48 [StorableType("507933FD-C6B8-44DB-BE23-0343CED49204")] 46 49 public interface IAggregator { 47 50 IEnumerable<IValueLayer> Aggregate(IEnumerable<IValueLayer> layers, ItemArray<ItemList<IntValue>> sources); 48 51 } 49 52 53 [StorableType("6CD7E1DD-7862-49C7-8B2A-6F756D7A775F")] 50 54 public class SumAggregator : IAggregator { 51 55 public ILayerDescriptor TargetLayerDescriptor { get; private set; } 56 [StorableConstructor] 57 protected SumAggregator(StorableConstructorFlag _) { } 58 52 59 public SumAggregator(ILayerDescriptor descriptor) { TargetLayerDescriptor = descriptor; } 53 60 public IEnumerable<IValueLayer> Aggregate(IEnumerable<IValueLayer> layers, ItemArray<ItemList<IntValue>> sources) { … … 61 68 } 62 69 63 [Storable Class(StorableClassType.AllFieldsAndAllProperties)]70 [StorableType(StorableMemberSelection.AllFieldsAndAllProperties, "4C00E073-D186-49CD-A794-8A44B55779E8")] 64 71 public class LayerDescriptor : Item, ILayerDescriptor { 65 72 66 public string Name 73 public string Name { get; private set; } 67 74 public string Unit { get; private set; } 68 75 public string Description { get; private set; } … … 70 77 public string FullName { get; private set; } 71 78 72 protected LayerDescriptor(bool isDeserializing) : base(isDeserializing) { } 79 [StorableConstructor] 80 protected LayerDescriptor(StorableConstructorFlag _) : base(_) { } 81 73 82 protected LayerDescriptor(LayerDescriptor orig, Cloner cloner) : base(orig, cloner) { } 74 83 … … 175 184 176 185 private static void DiscoverLayers() { 177 if (LAYERS.Count == 0) { 178 LAYERS.AddRange( 179 typeof (LayerDescriptor) 180 .GetFields(BindingFlags.Static | BindingFlags.Public) 181 .Select(f => f.GetValue(null)) 182 .Where(v => v is LayerDescriptor) 183 .Cast<LayerDescriptor>() 184 .OrderByDescending(l => l.Name.Length)); 185 foreach (var l1 in LAYERS) { 186 foreach (var l2 in LAYERS) { 187 if (l1 != l2 && l1.IsSuffixOf(l2.FullName)) 188 throw new InvalidOperationException(string.Format("Layer overlap detected \"{0}\" is suffix of \"{1}\"", l1.FullName, l2.FullName)); 189 } 186 if (LAYERS.Count == 0) { 187 LAYERS.AddRange( 188 typeof(LayerDescriptor) 189 .GetFields(BindingFlags.Static | BindingFlags.Public) 190 .Select(f => f.GetValue(null)) 191 .Where(v => v is LayerDescriptor) 192 .Cast<LayerDescriptor>() 193 .OrderByDescending(l => l.Name.Length)); 194 foreach (var l1 in LAYERS) { 195 foreach (var l2 in LAYERS) { 196 if (l1 != l2 && l1.IsSuffixOf(l2.FullName)) 197 throw new InvalidOperationException(string.Format("Layer overlap detected \"{0}\" is suffix of \"{1}\"", l1.FullName, l2.FullName)); 190 198 } 191 199 } 192 } 193 194 public static IEnumerable<LayerDescriptor> Layers { 195 get { DiscoverLayers(); return LAYERS; } 200 } 201 } 202 203 public static IEnumerable<LayerDescriptor> Layers 204 { 205 get { DiscoverLayers(); return LAYERS; } 196 206 } 197 207 -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/SolutionCreation/BioBoostSolutionCreator.cs
r13071 r16575 33 33 using System.Linq; 34 34 using HeuristicLab.BioBoost.Representation; 35 using HEAL.Attic; 35 36 36 37 namespace HeuristicLab.BioBoost.SolutionCreation { 37 38 38 [Storable Class]39 [StorableType("531890AB-4D1C-4CC2-B2C8-66809BD010D7")] 39 40 public class BioBoostSolutionCreator : SingleSuccessorOperator, ISolutionCreator { 40 41 … … 77 78 #region Construction & Cloning 78 79 [StorableConstructor] 79 protected BioBoostSolutionCreator( bool isDeserializing) : base(isDeserializing) {}80 protected BioBoostSolutionCreator(StorableConstructorFlag _) : base(_) { } 80 81 protected BioBoostSolutionCreator(BioBoostSolutionCreator orig, Cloner cloner) : base(orig, cloner) {} 81 82 public BioBoostSolutionCreator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/SolutionCreation/ConstantValueRealVectorCreator.cs
r13071 r16575 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 28 using System.Linq; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.BioBoost.SolutionCreation { 31 32 32 [Storable Class]33 [StorableType("50661F1E-4A8A-40D4-983B-3D55E93E1465")] 33 34 public class ConstantValueRealVectorCreator : RealVectorCreator { 34 35 … … 44 45 #region Construction & Cloning 45 46 [StorableConstructor] 46 protected ConstantValueRealVectorCreator( bool isDeserializing) : base(isDeserializing) {}47 protected ConstantValueRealVectorCreator(StorableConstructorFlag _) : base(_) { } 47 48 protected ConstantValueRealVectorCreator(ConstantValueRealVectorCreator orig, Cloner cloner) : base(orig, cloner) {} 48 49 public ConstantValueRealVectorCreator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/SolutionCreation/IdentityIntegerVectorCreator.cs
r13071 r16575 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 27 using System.Linq; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.BioBoost.SolutionCreation { 30 31 31 [Storable Class]32 [StorableType("EAFB8250-A9EB-43BA-B1B3-EF026493DCE7")] 32 33 public class IdentityIntegerVectorCreator : IntegerVectorCreator { 33 34 34 35 #region Construction & Cloning 35 36 [StorableConstructor] 36 protected IdentityIntegerVectorCreator( bool isDeserializing) : base(isDeserializing) {}37 protected IdentityIntegerVectorCreator(StorableConstructorFlag _) : base(_) { } 37 38 protected IdentityIntegerVectorCreator(IdentityIntegerVectorCreator orig, Cloner cloner) : base(orig, cloner) {} 38 39 public IdentityIntegerVectorCreator() { } -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/SolutionCreation/LimitedValuesIntegerVectorCreator.cs
r13071 r16575 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 28 using System.Linq; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.BioBoost.SolutionCreation { 31 32 32 [Storable Class]33 [StorableType("83148271-792B-471B-99C0-740E8671940A")] 33 34 public class LimitedValuesIntegerVectorCreator : IntegerVectorCreator { 34 35 … … 48 49 #region Construction & Cloning 49 50 [StorableConstructor] 50 protected LimitedValuesIntegerVectorCreator( bool isDeserializing) : base(isDeserializing) {}51 protected LimitedValuesIntegerVectorCreator(StorableConstructorFlag _) : base(_) { } 51 52 protected LimitedValuesIntegerVectorCreator(LimitedValuesIntegerVectorCreator orig, Cloner cloner) : base(orig, cloner) {} 52 53 public LimitedValuesIntegerVectorCreator() { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Utils/Closure.cs
r13071 r16575 23 23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 24 24 using System; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.BioBoost.Utils { … … 32 33 /// </summary> 33 34 /// <typeparam name="T">The Type of the value to be wrapped.</typeparam> 34 [Storable Class]35 [StorableType("75502002-CE4F-4B62-B37B-FEB93F899BA3")] 35 36 public class Closure<T> : IDeepCloneable { 36 37 … … 47 48 48 49 [StorableConstructor] 49 protected Closure( bool isDeserializing) {50 protected Closure(StorableConstructorFlag _) { 50 51 T value = default(T); 51 52 Getter = () => value; -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/Utils/StepFunction.cs
r13071 r16575 30 30 using System.Linq; 31 31 using System.Text.RegularExpressions; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.BioBoost.Utils { 34 35 35 [Storable Class]36 [StorableType("38ABD326-0F33-4B2F-A41C-547BADF7CA3A")] 36 37 [Item("StepFunction", "A simple step function specifying upper bounds and corresponding values.")] 37 38 public class StepFunction : ParameterizedNamedItem { … … 52 53 } 53 54 [StorableConstructor] 54 protected StepFunction( bool isDeserializing) : base(isDeserializing) {}55 protected StepFunction(StorableConstructorFlag _) : base(_) { } 55 56 protected StepFunction(StepFunction orig, Cloner cloner) : base(orig, cloner) {} 56 57 public override IDeepCloneable Clone(Cloner cloner) { -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/app.config
r13069 r16575 1 <?xml version="1.0" encoding="utf-8"?>1 <?xml version="1.0" encoding="utf-8"?> 2 2 <configuration> 3 3 <runtime> 4 4 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> 5 5 <dependentAssembly> 6 <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" 7 <bindingRedirect oldVersion="0.0.0.0-1.7.3.0" newVersion="1.7.3.0" 6 <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral"/> 7 <bindingRedirect oldVersion="0.0.0.0-1.7.3.0" newVersion="1.7.3.0"/> 8 8 </dependentAssembly> 9 9 <dependentAssembly> 10 <assemblyIdentity name="NetTopologySuite" publicKeyToken="f580a05016ebada1" culture="neutral" 11 <bindingRedirect oldVersion="0.0.0.0-1.13.3.0" newVersion="1.13.3.0" 10 <assemblyIdentity name="NetTopologySuite" publicKeyToken="f580a05016ebada1" culture="neutral"/> 11 <bindingRedirect oldVersion="0.0.0.0-1.13.3.0" newVersion="1.13.3.0"/> 12 12 </dependentAssembly> 13 13 </assemblyBinding> 14 14 </runtime> 15 < /configuration>15 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration> -
addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost/3.3/packages.config
r13617 r16575 4 4 <package id="Common.Logging" version="2.0.0" targetFramework="net45" /> 5 5 <package id="GeoAPI" version="1.7.2" targetFramework="net45" /> 6 <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" /> 7 <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" /> 6 8 <package id="NetTopologySuite" version="1.13.2" targetFramework="net45" /> 7 9 <package id="NetTopologySuite.IO" version="1.13.2" targetFramework="net45" /> … … 10 12 <package id="SharpMap" version="1.1.0" targetFramework="net45" /> 11 13 <package id="System.Data.SQLite.MSIL" version="1.0.86.0" targetFramework="net45" /> 14 <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" /> 12 15 <package id="YamlDotNet" version="3.8.0" targetFramework="net45" /> 13 16 </packages> -
addons/HeuristicLab.Problems.BioBoost/packages
- Property svn:ignore
-
old new 11 11 YamlDotNet.3.7.0 12 12 YamlDotNet.3.8.0 13 System.Drawing.Common.4.5.1 14 HEAL.Attic.1.0.0-pre02 15 Google.Protobuf.3.6.1
-
- Property svn:ignore
Note: See TracChangeset
for help on using the changeset viewer.