Changeset 16958


Ignore:
Timestamp:
05/15/19 14:52:20 (12 days ago)
Author:
abeham
Message:

#2457: adapted to trunk

Location:
branches/2457_ExpertSystem
Files:
58 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape

  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/AdaptiveWalk.cs

    r13583 r16958  
    2020#endregion
    2121
     22using System.Linq;
     23using HEAL.Attic;
    2224using HeuristicLab.Common;
    2325using HeuristicLab.Core;
    2426using HeuristicLab.Data;
    2527using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2728using HeuristicLab.Selection;
    28 using System.Linq;
    2929
    3030namespace HeuristicLab.Analysis.FitnessLandscape {
    3131  [Item("Adaptive Walk", "An adaptive walk applies a certain manipulation operation always taking the best of the sample.")]
    32   [StorableClass]
     32  [StorableType("872681B9-5489-4DEF-A6B2-F5663C58E108")]
    3333  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 303)]
    3434  public sealed class AdaptiveWalk : LocalAnalysis<BestSelector> {
     
    3939
    4040    [StorableConstructor]
    41     private AdaptiveWalk(bool deserializing) : base(deserializing) { }
     41    private AdaptiveWalk(StorableConstructorFlag _) : base(_) { }
    4242    private AdaptiveWalk(AdaptiveWalk original, Cloner cloner) : base(original, cloner) { }
    4343    public AdaptiveWalk()
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/LocalAnalysis.cs

    r13920 r16958  
    2020#endregion
    2121
     22using System;
     23using System.Linq;
     24using HEAL.Attic;
    2225using HeuristicLab.Common;
    2326using HeuristicLab.Core;
     
    2730using HeuristicLab.Optimization.Operators;
    2831using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3032using HeuristicLab.Random;
    31 using System;
    32 using System.Linq;
    3333
    3434namespace HeuristicLab.Analysis.FitnessLandscape {
    3535  [Item("Local Analysis", "A local analysis algorithm.")]
    36   [StorableClass]
     36  [StorableType("2D91C41A-81F8-4EDC-8FD9-F9AE8F4BDA1D")]
    3737  public abstract class LocalAnalysis<T> : HeuristicOptimizationEngineAlgorithm, IStorableContent where T : class, IOperator, new() {
    3838    public string Filename { get; set; }
     
    100100
    101101    [StorableConstructor]
    102     protected LocalAnalysis(bool deserializing) : base(deserializing) { }
     102    protected LocalAnalysis(StorableConstructorFlag _) : base(_) { }
    103103    protected LocalAnalysis(LocalAnalysis<T> original, Cloner cloner)
    104104      : base(original, cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/LocalAnalysisMainLoop.cs

    r13583 r16958  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
     
    2728using HeuristicLab.Optimization.Operators;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Selection;
    3131
     
    3535  /// </summary>
    3636  [Item("LocalAnalysisMainLoop", "An operator which represents the main loop of a best improvement local search (if only a single move is generated in each iteration it is a first improvement local search).")]
    37   [StorableClass]
     37  [StorableType("EA4AD808-4F92-4179-8828-F3D86116FC9F")]
    3838  public class LocalAnalysisMainLoop : AlgorithmOperator {
    3939
     
    7272
    7373    [StorableConstructor]
    74     protected LocalAnalysisMainLoop(bool deserializing) : base(deserializing) { }
     74    protected LocalAnalysisMainLoop(StorableConstructorFlag _) : base(_) { }
    7575    protected LocalAnalysisMainLoop(LocalAnalysisMainLoop original, Cloner cloner) : base(original, cloner) { }
    7676    public LocalAnalysisMainLoop()
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/RandomWalk.cs

    r13583 r16958  
    2020#endregion
    2121
     22using System.Linq;
     23using HEAL.Attic;
    2224using HeuristicLab.Common;
    2325using HeuristicLab.Core;
    2426using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2627using HeuristicLab.Selection;
    27 using System.Linq;
    2828
    2929namespace HeuristicLab.Analysis.FitnessLandscape {
    3030  [Item("Random Walk", "A random walk applies a certain manipulation operation over and over.")]
    31   [StorableClass]
     31  [StorableType("2997A654-7B98-4979-939D-D07A5D06D77C")]
    3232  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 301)]
    3333  public sealed class RandomWalk : LocalAnalysis<RandomSelector> {
    3434
    3535    [StorableConstructor]
    36     private RandomWalk(bool deserializing) : base(deserializing) { }
     36    private RandomWalk(StorableConstructorFlag _) : base(_) { }
    3737    private RandomWalk(RandomWalk original, Cloner cloner) : base(original, cloner) { }
    3838    public RandomWalk()
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/UpDownWalk.cs

    r13583 r16958  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Data;
    2526using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    2828namespace HeuristicLab.Analysis.FitnessLandscape {
    2929  [Item("Up/Down Walk", "An up/down walk attempts to take the best of the sample until no better can be found and then switch to take the worse until no worse can be found.")]
    30   [StorableClass]
     30  [StorableType("81877EC4-294E-474A-8E48-6E37D0B702BC")]
    3131  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 302)]
    3232  public sealed class UpDownWalk : LocalAnalysis<UpDownSelector> {
     
    3737
    3838    [StorableConstructor]
    39     private UpDownWalk(bool deserializing) : base(deserializing) { }
     39    private UpDownWalk(StorableConstructorFlag _) : base(_) { }
    4040    private UpDownWalk(UpDownWalk original, Cloner cloner) : base(original, cloner) { }
    4141    public UpDownWalk()
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/FitnessCloudAnalyzer.cs

    r13583 r16958  
    2222using System.Drawing;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    2728using HeuristicLab.Optimization.Operators;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape {
    3232
    33   [StorableClass]
     33  [StorableType("4156976F-4E61-48BA-B598-FEA872F2E948")]
    3434  public class FitnessCloudAnalyzer : AlgorithmOperator, IQualityTrailAnalyzer {
    3535    public bool EnabledByDefault {
     
    5050
    5151    [StorableConstructor]
    52     protected FitnessCloudAnalyzer(bool deserializing) : base(deserializing) { }
     52    protected FitnessCloudAnalyzer(StorableConstructorFlag _) : base(_) { }
    5353    protected FitnessCloudAnalyzer(FitnessCloudAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5454
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/InformationAnalyzer.cs

    r16955 r16958  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
     
    2728using HeuristicLab.Optimization;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape {
    3232
    33   [StorableClass]
     33  [StorableType("57803A7A-E1A7-4AD8-9F32-D97F5983ACBD")]
    3434  public class InformationAnalyzer : SingleSuccessorOperator, IQualityTrailAnalyzer {
    3535    public bool EnabledByDefault {
     
    8383
    8484    [StorableConstructor]
    85     protected InformationAnalyzer(bool deserializing) : base(deserializing) { }
     85    protected InformationAnalyzer(StorableConstructorFlag _) : base(_) { }
    8686    protected InformationAnalyzer(InformationAnalyzer original, Cloner cloner) : base(original, cloner) { }
    8787
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/QualityTrailMultiAnalyzer.cs

    r13583 r16958  
    2020#endregion
    2121
     22using System.Linq;
     23using HEAL.Attic;
    2224using HeuristicLab.Common;
    2325using HeuristicLab.Core;
     
    2628using HeuristicLab.Optimization;
    2729using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2930using HeuristicLab.PluginInfrastructure;
    30 using System.Linq;
    3131
    3232namespace HeuristicLab.Analysis.FitnessLandscape {
    3333  [Item("QualityTrailAnalyzer", "An analyzer that creates a quality trail which can be further analyzed by several analyzers.")]
    34   [StorableClass]
     34  [StorableType("E02FC8FB-85AD-42AB-8E14-EA509579C8BE")]
    3535  public class QualityTrailMultiAnalyzer : CheckedMultiOperator<IQualityTrailAnalyzer>, IAnalyzer {
    3636    public bool EnabledByDefault {
     
    6767
    6868    [StorableConstructor]
    69     protected QualityTrailMultiAnalyzer(bool deserializing) : base(deserializing) { }
     69    protected QualityTrailMultiAnalyzer(StorableConstructorFlag _) : base(_) { }
    7070    protected QualityTrailMultiAnalyzer(QualityTrailMultiAnalyzer original, Cloner cloner) : base(original, cloner) { }
    7171    public QualityTrailMultiAnalyzer()
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/RuggednessAnalyzer.cs

    r16096 r16958  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
     
    2728using HeuristicLab.Optimization;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape {
    3232  [Item("Ruggedness Analyzer", "Analyzes autocorrelation for one mutation step and correlation length. Correlation length is calculated according to the statistical correlation length defined by Hordijk, W., 1996. A measure of landscapes. Evolutionary computation, 4(4), pp.335-360.")]
    33   [StorableClass]
     33  [StorableType("F018AA6C-B392-4D10-8817-D058D7678149")]
    3434  public class RuggednessAnalyzer : SingleSuccessorOperator, IQualityTrailAnalyzer {
    3535    public bool EnabledByDefault {
     
    5656
    5757    [StorableConstructor]
    58     protected RuggednessAnalyzer(bool deserializing) : base(deserializing) { }
     58    protected RuggednessAnalyzer(StorableConstructorFlag _) : base(_) { }
    5959    protected RuggednessAnalyzer(RuggednessAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6060    public RuggednessAnalyzer() {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/UpDownWalkAnalyzer.cs

    r16096 r16958  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
     
    2728using HeuristicLab.Optimization;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape {
    3232  [Item("Up/Down Walk Analyzer", "Analyzes the quality trail produced from an up/down walk.")]
    33   [StorableClass]
     33  [StorableType("0D054A87-A040-4DC5-A722-0952EE96C924")]
    3434  public class UpDownWalkAnalyzer : SingleSuccessorOperator, IQualityTrailAnalyzer {
    3535    public bool EnabledByDefault {
     
    6565
    6666    [StorableConstructor]
    67     protected UpDownWalkAnalyzer(bool deserializing) : base(deserializing) { }
     67    protected UpDownWalkAnalyzer(StorableConstructorFlag _) : base(_) { }
    6868    protected UpDownWalkAnalyzer(UpDownWalkAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6969    public UpDownWalkAnalyzer() {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/AdaptiveWalkCalculator.cs

    r16137 r16958  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    2627using HeuristicLab.Data;
    2728using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    3030namespace HeuristicLab.Analysis.FitnessLandscape {
    3131  [Item("Adaptive Walk Calculator", "Calculates characteristics from an adaptive walk.")]
    32   [StorableClass]
     32  [StorableType("C7E8743D-572E-43DC-A4F3-8044CA4E412E")]
    3333  public sealed class AdaptiveWalkCalculator : AlgorithmCharacteristicCalculator<AdaptiveWalk> {
    3434
    3535    [StorableConstructor]
    36     private AdaptiveWalkCalculator(bool deserializing) : base(deserializing) { }
     36    private AdaptiveWalkCalculator(StorableConstructorFlag _) : base(_) { }
    3737    private AdaptiveWalkCalculator(AdaptiveWalkCalculator original, Cloner cloner)
    3838      : base(original, cloner) { }
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/AlgorithmCharacteristicCalculator.cs

    r16137 r16958  
    2121
    2222using System.Collections.Generic;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Optimization;
    2627using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    2929namespace HeuristicLab.Analysis.FitnessLandscape {
    30   [StorableClass]
     30  [StorableType("19468006-B8AE-485A-BECC-2E4DD0A0B059")]
    3131  public abstract class AlgorithmCharacteristicCalculator<TAlgorithm> : CharacteristicCalculator
    3232    where TAlgorithm : class, IAlgorithm {
     
    4949   
    5050    [StorableConstructor]
    51     protected AlgorithmCharacteristicCalculator(bool deserializing) : base(deserializing) { }
     51    protected AlgorithmCharacteristicCalculator(StorableConstructorFlag _) : base(_) { }
    5252    protected AlgorithmCharacteristicCalculator(AlgorithmCharacteristicCalculator<TAlgorithm> original, Cloner cloner)
    5353    : base(original, cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/CharacteristicCalculator.cs

    r16137 r16958  
    2121
    2222using System.Collections.Generic;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Data;
    2627using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    2929namespace HeuristicLab.Analysis.FitnessLandscape {
    3030  [Item("Characteristic Calculator", "")]
    31   [StorableClass]
     31  [StorableType("108AEE01-0E47-42EF-9113-D118DA405215")]
    3232  public abstract class CharacteristicCalculator : ParameterizedNamedItem, ICharacteristicCalculator {
    3333
     
    4444
    4545    [StorableConstructor]
    46     protected CharacteristicCalculator(bool deserializing) : base(deserializing) { }
     46    protected CharacteristicCalculator(StorableConstructorFlag _) : base(_) { }
    4747    protected CharacteristicCalculator(CharacteristicCalculator original, Cloner cloner)
    4848      : base(original, cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/FLACharacterizer.cs

    r16137 r16958  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
     
    3030namespace HeuristicLab.Analysis.FitnessLandscape {
    3131  [Item("FLA Characterizer", "An algorithm that executes a characteristic calculator.")]
    32   [StorableClass]
     32  [StorableType("9843C276-463D-4B79-A44B-7BD1F3B23FB6")]
    3333  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 300)]
    3434  public sealed class FLACharacterizer : BasicAlgorithm {
     
    4444
    4545    [StorableConstructor]
    46     private FLACharacterizer(bool deserializing) : base(deserializing) { }
     46    private FLACharacterizer(StorableConstructorFlag _) : base(_) { }
    4747    private FLACharacterizer(FLACharacterizer original, Cloner cloner)
    4848      : base(original, cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/QAP/QAPCharacteristicCalculator.cs

    r16137 r16958  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    2728using HeuristicLab.Data;
    2829using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Problems.QuadraticAssignment;
    3131
    3232namespace HeuristicLab.Analysis.FitnessLandscape {
    3333  [Item("QAP Characteristic Calculator", "")]
    34   [StorableClass]
     34  [StorableType("84B82178-F412-412B-B388-4288AA15B11D")]
    3535  public sealed class QAPCharacteristicCalculator : CharacteristicCalculator {
    3636
    3737    [StorableConstructor]
    38     private QAPCharacteristicCalculator(bool deserializing) : base(deserializing) { }
     38    private QAPCharacteristicCalculator(StorableConstructorFlag _) : base(_) { }
    3939    private QAPCharacteristicCalculator(QAPCharacteristicCalculator original, Cloner cloner) : base(original, cloner) { }
    4040    public QAPCharacteristicCalculator() {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/QAP/QAPDirectedWalk.cs

    r16137 r16958  
    2424using System.Linq;
    2525using System.Threading;
     26using HEAL.Attic;
    2627using HeuristicLab.Common;
    2728using HeuristicLab.Core;
     
    3031using HeuristicLab.Optimization;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Problems.QuadraticAssignment;
    3434using HeuristicLab.Random;
     
    3636namespace HeuristicLab.Analysis.FitnessLandscape {
    3737  [Item("Directed Walk (QAP-specific)", "")]
    38   [StorableClass]
     38  [StorableType("273C15EA-8362-4F36-AA94-5773A4FE8717")]
    3939  public class QAPDirectedWalk : CharacteristicCalculator {
    4040
     
    8080
    8181    [StorableConstructor]
    82     private QAPDirectedWalk(bool deserializing) : base(deserializing) { }
     82    private QAPDirectedWalk(StorableConstructorFlag _) : base(_) { }
    8383    private QAPDirectedWalk(QAPDirectedWalk original, Cloner cloner) : base(original, cloner) { }
    8484    public QAPDirectedWalk() {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/RandomWalkCalculator.cs

    r16137 r16958  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    2627using HeuristicLab.Data;
    2728using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    3030namespace HeuristicLab.Analysis.FitnessLandscape {
    3131  [Item("Random Walk Calculator", "Calculates characteristics from a random walk.")]
    32   [StorableClass]
     32  [StorableType("FF8080CA-5E93-4390-8184-67B92EBF5ACD")]
    3333  public sealed class RandomWalkCalculator : AlgorithmCharacteristicCalculator<RandomWalk> {
    3434
    3535    [StorableConstructor]
    36     private RandomWalkCalculator(bool deserializing) : base(deserializing) { }
     36    private RandomWalkCalculator(StorableConstructorFlag _) : base(_) { }
    3737    private RandomWalkCalculator(RandomWalkCalculator original, Cloner cloner) : base(original, cloner) { }
    3838    public RandomWalkCalculator() : this(new RandomWalk()) { }
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/UpDownWalkCalculator.cs

    r16137 r16958  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    2627using HeuristicLab.Data;
    2728using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    3030namespace HeuristicLab.Analysis.FitnessLandscape {
    3131  [Item("Up/Down Walk Calculator", "Calculates characteristics from an up/down walk.")]
    32   [StorableClass]
     32  [StorableType("3DDC32D3-A1F8-4A59-9AF1-48AFFC50B4E4")]
    3333  public sealed class UpDownWalkCalculator : AlgorithmCharacteristicCalculator<UpDownWalk> {
    3434
    3535    [StorableConstructor]
    36     private UpDownWalkCalculator(bool deserializing) : base(deserializing) { }
     36    private UpDownWalkCalculator(StorableConstructorFlag _) : base(_) { }
    3737    private UpDownWalkCalculator(UpDownWalkCalculator original, Cloner cloner) : base(original, cloner) { }
    3838    public UpDownWalkCalculator() : this(new UpDownWalk()) { }
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/BinaryVectorDistanceCalculator.cs

    r13583 r16958  
    2222using System;
    2323using System.Drawing;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Common.Resources;
    2627using HeuristicLab.Core;
    2728using HeuristicLab.Encodings.BinaryVectorEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    3030namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
    3131
    3232  [Item("BinaryVectorDistanceCalculator", "Calculates the hamming distance of two binary vectors")]
    33   [StorableClass]
     33  [StorableType("BB6A8FD8-22B1-41CC-B38D-C8C9A2B79C83")]
    3434  public class BinaryVectorDistanceCalculator : NamedItem, IItemDistanceCalculator {
    3535
     
    4545
    4646    [StorableConstructor]
    47     protected BinaryVectorDistanceCalculator(bool deserializing) : base(deserializing) { }
     47    protected BinaryVectorDistanceCalculator(StorableConstructorFlag _) : base(_) { }
    4848
    4949    protected BinaryVectorDistanceCalculator(BinaryVectorDistanceCalculator original, Cloner cloner)
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/IItemDistanceCalculator.cs

    r13583 r16958  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Core;
    2425
    2526namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
     27  [StorableType("79CBD877-B9E9-4CFE-B1E3-5FCF0DB17EF1")]
    2628  public interface IItemDistanceCalculator : IItem {
    2729    Type ItemType { get; }
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/PermutationDistanceCalculator.cs

    r13583 r16958  
    2323using System.Collections.Generic;
    2424using System.Drawing;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Common.Resources;
    2728using HeuristicLab.Core;
    2829using HeuristicLab.Encodings.PermutationEncoding;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
    3232
    3333  [Item("PermutationDistanceCalculator", "Calculates the distance of two permutations")]
    34   [StorableClass]
     34  [StorableType("F2B93749-3059-4D37-91A5-FAE2DC9DB794")]
    3535  public class PermutationDistanceCalculator : NamedItem, IItemDistanceCalculator {
    3636
     
    4646
    4747    [StorableConstructor]
    48     protected PermutationDistanceCalculator(bool deserializing) : base(deserializing) { }
     48    protected PermutationDistanceCalculator(StorableConstructorFlag _) : base(_) { }
    4949
    5050    protected PermutationDistanceCalculator(PermutationDistanceCalculator original, Cloner cloner)
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/RealVectorDistanceCalculator.cs

    r13583 r16958  
    2222using System;
    2323using System.Drawing;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Common.Resources;
     
    2728using HeuristicLab.Encodings.BinaryVectorEncoding;
    2829using HeuristicLab.Encodings.RealVectorEncoding;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
    3232
    3333  [Item("RealVectorDistanceCalculator", "Calculates the Euclidian distance of two real vectors")]
    34   [StorableClass]
     34  [StorableType("26271DB0-0868-4363-84AE-46CF583276F0")]
    3535  public class RealVectorDistanceCalculator : NamedItem, IItemDistanceCalculator {
    3636
     
    4646
    4747    [StorableConstructor]
    48     protected RealVectorDistanceCalculator(bool deserializing) : base(deserializing) { }
     48    protected RealVectorDistanceCalculator(StorableConstructorFlag _) : base(_) { }
    4949
    5050    protected RealVectorDistanceCalculator(RealVectorDistanceCalculator original, Cloner cloner)
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/BinaryVectorFitnessDistanceCorrelationAnalyzer.cs

    r7128 r16958  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    2728using HeuristicLab.Encodings.BinaryVectorEncoding;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape {
    3232
    3333  [Item("BinaryVectorFitnessDistanceCorrelationAnalyzer", "An operator that analyzes the correlation between fitness and distance to the best know solution for binary vector encoding")]
    34   [StorableClass]
     34  [StorableType("BE5474B1-9D8E-4AA0-9236-85C192712A96")]
    3535  public class BinaryVectorFitnessDistanceCorrelationAnalyzer : FitnessDistanceCorrelationAnalyzer, IBinaryVectorOperator {
    3636
     
    4545
    4646    [StorableConstructor]
    47     protected BinaryVectorFitnessDistanceCorrelationAnalyzer(bool deserializing) : base(deserializing) { }
     47    protected BinaryVectorFitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { }
    4848    protected BinaryVectorFitnessDistanceCorrelationAnalyzer(BinaryVectorFitnessDistanceCorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4949
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/FitnessDistanceCorrelationAnalyzer.cs

    r7176 r16958  
    2323using System.Drawing;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
     
    3031using HeuristicLab.Optimization.Operators;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333
    3434namespace HeuristicLab.Analysis.FitnessLandscape {
    3535
    36   [StorableClass]
     36  [StorableType("A603BC77-CAA7-468B-9206-500A196691E7")]
    3737  public abstract class FitnessDistanceCorrelationAnalyzer : AlgorithmOperator, IAnalyzer {
    3838    public bool EnabledByDefault {
     
    5353
    5454    [StorableConstructor]
    55     protected FitnessDistanceCorrelationAnalyzer(bool deserializing) : base(deserializing) { }
     55    protected FitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { }
    5656    protected FitnessDistanceCorrelationAnalyzer(FitnessDistanceCorrelationAnalyzer original, Cloner cloner)
    5757      : base(original, cloner) { }
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/PermutationFitnessDistanceCorrelationAnalyzer.cs

    r7128 r16958  
    2424using System.Drawing;
    2525using System.Linq;
     26using HEAL.Attic;
    2627using HeuristicLab.Common;
    2728using HeuristicLab.Core;
    2829using HeuristicLab.Encodings.PermutationEncoding;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131
    3232namespace HeuristicLab.Analysis.FitnessLandscape {
    3333
    3434  [Item("PermutationFitnessDistanceCorrelationAnalyzer", "An operator that analyzes the correlation between fitness and distance to the best know solution for permutation encoding")]
    35   [StorableClass]
     35  [StorableType("2021A1AA-FE98-4D42-8730-23C5EA552B21")]
    3636  public class PermutationFitnessDistanceCorrelationAnalyzer : FitnessDistanceCorrelationAnalyzer, IPermutationOperator {
    3737
     
    4646
    4747    [StorableConstructor]
    48     protected PermutationFitnessDistanceCorrelationAnalyzer(bool deserializing) : base(deserializing) { }
     48    protected PermutationFitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { }
    4949    protected PermutationFitnessDistanceCorrelationAnalyzer(PermutationFitnessDistanceCorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5050
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/QAPPermutationFitnessDistanceCorrelationAnalyzer.cs

    r7128 r16958  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    2728using HeuristicLab.Encodings.PermutationEncoding;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape {
    3232
    3333  [Item("QAPPermutationFitnessDistanceCorrelationAnalyzer", "An operator that analyzes the correlation between fitness and distance to the best know solution for permutation encoding")]
    34   [StorableClass]
     34  [StorableType("31823F7B-55FB-4D57-80EE-89F4D90B6412")]
    3535  public class QAPPermutationFitnessDistanceCorrelationAnalyzer : FitnessDistanceCorrelationAnalyzer, IPermutationOperator {
    3636
     
    5151
    5252    [StorableConstructor]
    53     protected QAPPermutationFitnessDistanceCorrelationAnalyzer(bool deserializing) : base(deserializing) { }
     53    protected QAPPermutationFitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { }
    5454    protected QAPPermutationFitnessDistanceCorrelationAnalyzer(QAPPermutationFitnessDistanceCorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5555
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/RealVectorFitnessDistanceCorrelationAnalyzer.cs

    r7128 r16958  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    2728using HeuristicLab.Encodings.RealVectorEncoding;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape {
    3232
    3333  [Item("RealVectorFitnessDistanceCorrelationAnalyzer", "An operator that analyzes the correlation between fitness and distance to the best know solution for real vector encoding")]
    34   [StorableClass]
     34  [StorableType("84EA2C55-F847-4CF9-B966-0E7B9DD8903C")]
    3535  public class RealVectorFitnessDistanceCorrelationAnalyzer : FitnessDistanceCorrelationAnalyzer, IRealVectorOperator {
    3636
     
    4545
    4646    [StorableConstructor]
    47     protected RealVectorFitnessDistanceCorrelationAnalyzer(bool deserializing) : base(deserializing) { }
     47    protected RealVectorFitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { }
    4848    protected RealVectorFitnessDistanceCorrelationAnalyzer(RealVectorFitnessDistanceCorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4949
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/ScatterPlot.cs

    r7291 r16958  
    2424using System.Drawing;
    2525using System.Linq;
     26using HEAL.Attic;
    2627using HeuristicLab.Common;
     28using HeuristicLab.Common.Resources;
    2729using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Common.Resources;
    3030
    3131namespace HeuristicLab.Analysis.FitnessLandscape {
     
    3939
    4040  [Item("ScatterPlot", "A scatter plot of 2D data")]
    41   [StorableClass]
     41  [StorableType("317254F8-A1D9-4675-8292-5CDF078B53BD")]
    4242  public class ScatterPlot : NamedItem {
    4343
     
    121121
    122122    [StorableConstructor]
    123     protected ScatterPlot(bool deserializing) : base(deserializing) { }
     123    protected ScatterPlot(StorableConstructorFlag _) : base(_) { }
    124124    protected ScatterPlot(ScatterPlot original, Cloner cloner)
    125125      : base(original, cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/HeuristicLab.Analysis.FitnessLandscape-3.3.csproj

    r16137 r16958  
    11<?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">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     
    1111    <RootNamespace>HeuristicLab.Analysis.FitnessLandscape</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Analysis.FitnessLandscape-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <SignAssembly>true</SignAssembly>
     
    9494    <Reference Include="ALGLIB-3.7.0">
    9595      <HintPath>..\..\..\..\trunk\bin\ALGLIB-3.7.0.dll</HintPath>
     96      <Private>False</Private>
     97    </Reference>
     98    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     99      <SpecificVersion>False</SpecificVersion>
     100      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
    96101      <Private>False</Private>
    97102    </Reference>
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/DirectedPath.cs

    r14678 r16958  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    2929namespace HeuristicLab.Analysis.FitnessLandscape {
    3030  [Item("Directed Path", "")]
    31   [StorableClass]
     31  [StorableType("4FD1A99C-7858-4AB9-916F-FEE00B4FD66D")]
    3232  public class DirectedPath<T> : Item where T : class, IDeepCloneable {
    3333    [Storable]
     
    3838
    3939    [StorableConstructor]
    40     protected DirectedPath(bool deserializing) : base(deserializing) { }
     40    protected DirectedPath(StorableConstructorFlag _) : base(_) { }
    4141    protected DirectedPath(DirectedPath<T> original, Cloner cloner)
    4242      : base(original, cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/PRProblemInstanceAnalyzer.cs

    r14678 r16958  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    24 using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2726
    2827namespace HeuristicLab.Analysis.FitnessLandscape {
    2928  [Item("Path-Relinking Problem Instance Analyzer", "Tries to identify the current problem instance being solved by analyzing the output of path-relinking heuristics.")]
    30   [StorableClass]
     29  [StorableType("1CBE2C82-1D1F-4C4E-BEC7-40EC914CB6C6")]
    3130  public abstract class PrProblemInstanceAnalyzer<T> : ProblemInstanceAnalyzer where T : class, IDeepCloneable {
    3231
     
    3837
    3938    [StorableConstructor]
    40     protected PrProblemInstanceAnalyzer(bool deserializing) : base(deserializing) { }
     39    protected PrProblemInstanceAnalyzer(StorableConstructorFlag _) : base(_) { }
    4140    protected PrProblemInstanceAnalyzer(PrProblemInstanceAnalyzer<T> original, Cloner cloner)
    4241      : base(original, cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/ProblemInstanceAnalyzer.cs

    r14691 r16958  
    2323using System.Globalization;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
     
    2930using HeuristicLab.Optimization;
    3031using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232
    3333namespace HeuristicLab.Analysis.FitnessLandscape {
    3434  [Item("Problem Instance Similarity Analyzer", "Base class for analyzing whether certain obtained characteristics match the characteristics of already known problem instances.")]
    35   [StorableClass]
     35  [StorableType("9E5EF806-15D1-44B9-AC0E-01501A62C052")]
    3636  public abstract class ProblemInstanceAnalyzer : SingleSuccessorOperator, IAnalyzer {
    3737
     
    5858
    5959    [StorableConstructor]
    60     protected ProblemInstanceAnalyzer(bool deserializing) : base(deserializing) { }
     60    protected ProblemInstanceAnalyzer(StorableConstructorFlag _) : base(_) { }
    6161
    6262    protected ProblemInstanceAnalyzer(ProblemInstanceAnalyzer original, Cloner cloner)
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/QAPPRProblemInstanceAnalyzer.cs

    r16137 r16958  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Data;
    2627using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    2929namespace HeuristicLab.Analysis.FitnessLandscape {
    3030  [Item("QAP Path-Relinking Problem Instance Analyzer", "")]
    31   [StorableClass]
     31  [StorableType("7A17AAA9-3687-412F-B80F-5517CC2FFE02")]
    3232  public sealed class QAPPRProblemInstanceAnalyzer : PrProblemInstanceAnalyzer<Permutation> {
    3333
    3434    [StorableConstructor]
    35     private QAPPRProblemInstanceAnalyzer(bool deserializing) : base(deserializing) { }
     35    private QAPPRProblemInstanceAnalyzer(StorableConstructorFlag _) : base(_) { }
    3636    private QAPPRProblemInstanceAnalyzer(QAPPRProblemInstanceAnalyzer original, Cloner cloner) : base(original, cloner) { }
    3737    public QAPPRProblemInstanceAnalyzer() { }
  • branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/UpDownSelector.cs

    r13583 r16958  
    2020#endregion
    2121
     22using System.Collections.Generic;
     23using System.Linq;
     24using HEAL.Attic;
    2225using HeuristicLab.Common;
    2326using HeuristicLab.Core;
     
    2629using HeuristicLab.Optimization;
    2730using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using System.Collections.Generic;
    30 using System.Linq;
    3131
    3232namespace HeuristicLab.Analysis.FitnessLandscape {
    3333  [Item("Up/DownSelector", "A selection operator that moves towards the next local optimum, when found reverses direction and so on.")]
    34   [StorableClass]
     34  [StorableType("4CECAA0E-CC36-4910-B951-22C78C8EBA91")]
    3535  public class UpDownSelector : InstrumentedOperator, IStochasticOperator {
    3636
     
    5656
    5757    [StorableConstructor]
    58     protected UpDownSelector(bool deserializing) : base(deserializing) { }
     58    protected UpDownSelector(StorableConstructorFlag _) : base(_) { }
    5959    protected UpDownSelector(UpDownSelector original, Cloner cloner) : base(original, cloner) { }
    6060    public UpDownSelector() {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/BestNScopesSolutionAnalyzer.cs

    r13744 r16958  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Linq;
     25using HEAL.Attic;
    2226using HeuristicLab.Common;
    2327using HeuristicLab.Core;
     
    2731using HeuristicLab.Optimization.Operators;
    2832using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using System;
    31 using System.Collections.Generic;
    32 using System.Linq;
    3333
    3434namespace HeuristicLab.Analysis {
     
    3737  /// </summary>
    3838  [Item("BestNScopesSolutionAnalyzer", "An operator that maintains at most N scopes containing good quality solutions.")]
    39   [StorableClass]
     39  [StorableType("9E9CB06C-EFF2-4A99-9203-E334771FF613")]
    4040  public class BestNScopesSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    4141
     
    8282    #region Storing & Cloning
    8383    [StorableConstructor]
    84     protected BestNScopesSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     84    protected BestNScopesSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    8585    protected BestNScopesSolutionAnalyzer(BestNScopesSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    8686    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs

    r14058 r16958  
    2020#endregion
    2121
     22using System;
     23using System.Linq;
     24using System.Threading;
     25using System.Threading.Tasks;
     26using HEAL.Attic;
    2227using HeuristicLab.Collections;
    2328using HeuristicLab.Common;
     
    2631using HeuristicLab.Optimization;
    2732using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using System;
    30 using System.Linq;
    31 using System.Threading;
    32 using System.Threading.Tasks;
    3333
    3434namespace HeuristicLab.Analysis {
     
    3838  [Item("Iterated Algorithm", "An algorithm that repeats an algorithm until either a certain target value is reached or a maximum budget is exceeded.")]
    3939  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 116)]
    40   [StorableClass]
     40  [StorableType("787AF25E-46FF-4FBF-A2ED-011E7F41AF58")]
    4141  public sealed class IteratedAlgorithm : Algorithm, IStorableContent {
    4242    private const string ExecutionTimeResultName = "Execution Time";
     
    166166
    167167    [StorableConstructor]
    168     private IteratedAlgorithm(bool deserializing) : base(deserializing) { }
     168    private IteratedAlgorithm(StorableConstructorFlag _) : base(_) { }
    169169    private IteratedAlgorithm(IteratedAlgorithm original, Cloner cloner)
    170170      : base(original, cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/SolutionSamplingOperator.cs

    r14776 r16958  
    2020#endregion
    2121
    22 using System;
     22using HEAL.Attic;
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
     
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2928
    3029namespace HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel {
    3130  [Item("Solution Sampling Operator", "Creates new solutions by sampling from a given model.")]
    32   [StorableClass]
     31  [StorableType("026C4C5E-8B97-4798-87E7-8B5958BDC79F")]
    3332  public class SolutionSamplingOperator : InstrumentedOperator {
    3433   
     
    4645
    4746    [StorableConstructor]
    48     protected SolutionSamplingOperator(bool deserializing) : base() { }
     47    protected SolutionSamplingOperator(StorableConstructorFlag _) : base(_) { }
    4948    protected SolutionSamplingOperator(SolutionSamplingOperator original, Cloner cloner)
    5049      : base(original, cloner) { }
  • branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/Univariate/UnivariateModel.cs

    r14776 r16958  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Data;
    2627using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    2929namespace HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel {
    3030  [Item("Univariate solution model (binary)", "")]
    31   [StorableClass]
     31  [StorableType("E30B8452-970C-4AF2-B7E7-4AC9C21928BA")]
    3232  public sealed class UnivariateModel : Item, ISolutionModel<BinaryVector> {
    3333    [Storable]
     
    3737
    3838    [StorableConstructor]
    39     private UnivariateModel(bool deserializing) : base(deserializing) { }
     39    private UnivariateModel(StorableConstructorFlag _) : base(_) { }
    4040    private UnivariateModel(UnivariateModel original, Cloner cloner)
    4141      : base(original, cloner) {
  • branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/Univariate/UnivariateModelTrainingOperator.cs

    r14776 r16958  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    2829using HeuristicLab.Optimization;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131
    3232namespace HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel {
     33  [StorableType("a70d9738-4012-442a-b6b2-b0aa2c34a3c5")]
    3334  public enum ModelBiasOptions {
    3435    Unbiased,
     
    3839
    3940  [Item("Univariate Model Training Operator", "Adds a univariate solution sampling model to the scope.")]
    40   [StorableClass]
     41  [StorableType("CF6BF85A-8AC0-4DF3-8591-671FCBDDB4F2")]
    4142  public class UnivariateModelTrainingOperator : InstrumentedOperator, IStochasticOperator, ISingleObjectiveOperator {
    4243
     
    7172
    7273    [StorableConstructor]
    73     protected UnivariateModelTrainingOperator(bool deserializing) : base() { }
     74    protected UnivariateModelTrainingOperator(StorableConstructorFlag _) : base(_) { }
    7475    protected UnivariateModelTrainingOperator(UnivariateModelTrainingOperator original, Cloner cloner)
    7576      : base(original, cloner) { }
  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Creators/PreexistingPermutationCreator.cs

    r13713 r16958  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
     
    2627using HeuristicLab.Optimization;
    2728using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929using HeuristicLab.Random;
    3030
     
    3434  /// </summary>
    3535  [Item("PreexistingPermutationCreator", "An operator which creates a new permutation of integer values from a set of given permutations.")]
    36   [StorableClass]
     36  [StorableType("D6EC71C0-2AC1-461B-B684-13352AC88A8C")]
    3737  public sealed class PreexistingPermutationCreator : InstrumentedOperator, IPermutationCreator, IPreexistingSolutionCreator, IStochasticOperator {
    3838    public override bool CanChangeName {
     
    6565
    6666    [StorableConstructor]
    67     private PreexistingPermutationCreator(bool deserializing) : base(deserializing) { }
     67    private PreexistingPermutationCreator(StorableConstructorFlag _) : base(_) { }
    6868    private PreexistingPermutationCreator(PreexistingPermutationCreator original, Cloner cloner) : base(original, cloner) { }
    6969    public PreexistingPermutationCreator()
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem.Common/3.3/HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj

    r15694 r16958  
    1010    <RootNamespace>HeuristicLab.OptimizationExpertSystem.Common</RootNamespace>
    1111    <AssemblyName>HeuristicLab.OptimizationExpertSystem.Common-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     14    <TargetFrameworkProfile />
    1415  </PropertyGroup>
    1516  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    7778      <Private>False</Private>
    7879    </Reference>
     80    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     81      <SpecificVersion>False</SpecificVersion>
     82      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     83      <Private>False</Private>
     84    </Reference>
    7985    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4">
    8086      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
     
    107113    <Reference Include="HeuristicLab.MainForm-3.3">
    108114      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     115      <Private>False</Private>
     116    </Reference>
     117    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     118      <SpecificVersion>False</SpecificVersion>
     119      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    109120      <Private>False</Private>
    110121    </Reference>
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem.Common/3.3/KnowledgeCenter.cs

    r15255 r16958  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Drawing;
     25using System.IO;
     26using System.Linq;
     27using System.Threading;
     28using System.Threading.Tasks;
     29using HeuristicLab.Algorithms.DataAnalysis;
    2230using HeuristicLab.Analysis;
    2331using HeuristicLab.Analysis.SelfOrganizingMaps;
     
    3240using HeuristicLab.Problems.DataAnalysis;
    3341using HeuristicLab.Random;
    34 using System;
    35 using System.Collections.Generic;
    36 using System.Drawing;
    37 using System.IO;
    38 using System.Linq;
    39 using System.Threading;
    40 using System.Threading.Tasks;
    41 using HeuristicLab.Algorithms.DataAnalysis;
    4242using Algorithm = HeuristicLab.Clients.OKB.Administration.Algorithm;
    4343using Problem = HeuristicLab.Clients.OKB.Administration.Problem;
     
    403403
    404404    public Task UpdateKnowledgeBaseAsync(IProgress progress = null) {
    405       if (progress == null) progress = new Progress(string.Empty);
     405      if (progress == null) progress = new Progress();
    406406      progress.Start("Updating Knowledge Base from OKB");
    407407      OnDownloadStarted(progress);
     
    417417      var adminClient = Clients.OKB.Administration.AdministrationClient.Instance;
    418418      try {
    419         progress.Status = "Connecting to OKB...";
     419        progress.Message = "Connecting to OKB...";
    420420        progress.ProgressValue = 0;
    421421        // FIXME: How to tell if refresh is necessary?
     
    434434
    435435        problemId2ProblemInstanceMapping.Clear();
    436         progress.Status = "Downloading algorithm and problem instances...";
     436        progress.Message = "Downloading algorithm and problem instances...";
    437437        progress.ProgressValue = 0;
    438438
     
    461461        var interestingValues = queryClient.ValueNames.Where(x => InterestingValueNames.Contains(x.Name)).ToList();
    462462
    463         progress.Status = "Downloading runs...";
     463        progress.Message = "Downloading runs...";
    464464        progress.ProgressValue = 0;
    465465        p[0] = 0;
     
    482482            }
    483483            SaveToCache(toCache);
    484             progress.Status = string.Format("Downloaded runs {0} to {1} of {2}...", p[0], p[0] + batch.Count, count);
     484            progress.Message = string.Format("Downloaded runs {0} to {1} of {2}...", p[0], p[0] + batch.Count, count);
    485485            p[0] += batch.Count;
    486486            progress.ProgressValue = p[0] / (double)count;
    487487          }
    488488        });
    489         progress.Status = "Finishing...";
     489        progress.Message = "Finishing...";
    490490
    491491        // remove algorithm instances that do not appear in any downloaded run
     
    556556            algorithmInstances.Add(alg);
    557557            algorithmId2AlgorithmInstanceMapping.Add(algInst.Id, alg);
    558             progress.Status = string.Format("Downloaded algorithm {0} (okb-id: {1})...", algInst.Name, algInst.Id);
     558            progress.Message = string.Format("Downloaded algorithm {0} (okb-id: {1})...", algInst.Name, algInst.Id);
    559559            p[0]++;
    560560            progress.ProgressValue = p[0] / (double)total;
     
    587587            problemId2ProblemInstanceMapping.Add(pInst.Id, probRun);
    588588            ProblemInstances.Add(probRun);
    589             progress.Status = string.Format("Downloaded problem {0} (okb-id: {1})....", pInst.Name, pInst.Id);
     589            progress.Message = string.Format("Downloaded problem {0} (okb-id: {1})....", pInst.Name, pInst.Id);
    590590            p[0]++;
    591591            progress.ProgressValue = p[0] / (double)totalProblems;
     
    628628              runList.Add(r.Item3);
    629629            }
    630             progress.Status = string.Format("Retrieved {0} of {1} from cache", runList.Count, total);
     630            progress.Message = string.Format("Retrieved {0} of {1} from cache", runList.Count, total);
    631631            progress.ProgressValue = (double)runList.Count / total;
    632632          }
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/KNearestNeighborRecommender.cs

    r15255 r16958  
    2020#endregion
    2121
     22using System.Linq;
     23using HEAL.Attic;
    2224using HeuristicLab.Common;
    2325using HeuristicLab.Core;
     
    2527using HeuristicLab.Optimization;
    2628using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using System.Linq;
    2929
    3030namespace HeuristicLab.OptimizationExpertSystem.Common {
    3131  [Item("K-Nearest Neighbor Recommender", "")]
    32   [StorableClass]
     32  [StorableType("A2DB464F-3F1D-47B0-944B-DE252D461A0C")]
    3333  public sealed class KNearestNeighborRecommender : ParameterizedNamedItem, IAlgorithmInstanceRecommender {
    3434   
     
    4343
    4444    [StorableConstructor]
    45     private KNearestNeighborRecommender(bool deserializing) : base(deserializing) { }
     45    private KNearestNeighborRecommender(StorableConstructorFlag _) : base(_) { }
    4646    private KNearestNeighborRecommender(KNearestNeighborRecommender original, Cloner cloner) : base(original, cloner) { }
    4747    public KNearestNeighborRecommender() {
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/OverallBestRecommender.cs

    r13803 r16958  
    2929using System.Collections.Generic;
    3030using System.Linq;
     31using HEAL.Attic;
    3132
    3233namespace HeuristicLab.OptimizationExpertSystem.Common {
    3334  [Item("Overall Best Recommender", "")]
    34   [StorableClass]
     35  [StorableType("CCB14209-4C6F-4C72-A4D9-F803D2232CFB")]
    3536  public class OverallBestRecommender : ParameterizedNamedItem, IAlgorithmInstanceRecommender {
    3637
     
    4041   
    4142    [StorableConstructor]
    42     private OverallBestRecommender(bool deserializing) : base(deserializing) { }
     43    private OverallBestRecommender(StorableConstructorFlag _) : base(_) { }
    4344    private OverallBestRecommender(OverallBestRecommender original, Cloner cloner) : base(original, cloner) { }
    4445    public OverallBestRecommender() { }
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj

    r15694 r16958  
    1010    <RootNamespace>HeuristicLab.OptimizationExpertSystem</RootNamespace>
    1111    <AssemblyName>HeuristicLab.OptimizationExpertSystem-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     14    <TargetFrameworkProfile />
    1415  </PropertyGroup>
    1516  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config/30_DownloadFromOkbMenuItem.cs

    r13767 r16958  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Drawing;
    2225using HeuristicLab.Common;
    2326using HeuristicLab.Common.Resources;
    2427using HeuristicLab.MainForm;
    25 using System;
    26 using System.Collections.Generic;
    27 using System.Drawing;
    2828
    2929namespace HeuristicLab.OptimizationExpertSystem.Menu {
     
    7272    private void DownloadProgressOnStateChanged(object sender, EventArgs eventArgs) {
    7373      var progress = (IProgress)sender;
    74       if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.Canceled) {
     74      if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.CancelRequested) {
    7575        SetToolStripItemEnabled(true);
    7676        progress.ProgressStateChanged -= DownloadProgressOnStateChanged;
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/OptimizationKnowledgeCenter.cs

    r13748 r16958  
    2020#endregion
    2121
     22using System;
     23using System.Windows.Forms;
    2224using HeuristicLab.Common;
    2325using HeuristicLab.MainForm;
    2426using HeuristicLab.MainForm.WindowsForms;
    2527using HeuristicLab.OptimizationExpertSystem.Common;
    26 using System;
    27 using System.Windows.Forms;
    2828
    2929namespace HeuristicLab.OptimizationExpertSystem {
     
    4545      e.Value.ProgressStateChanged += OnProgressStateChanged;
    4646      e.Value.ProgressValueChanged += OnProgressValueChanged;
    47       e.Value.StatusChanged += OnProgressStatusChanged;
     47      e.Value.MessageChanged += OnProgressStatusChanged;
    4848      progressBar.Value = progressBar.Minimum;
    4949      progressLabel.Text = string.Empty;
     
    5555      if (InvokeRequired) { Invoke((Action<object, EventArgs>)OnProgressStateChanged, sender, e); return; }
    5656      var progress = (IProgress)sender;
    57       if (progress.ProgressState == ProgressState.Canceled
     57      if (progress.ProgressState == ProgressState.CancelRequested
    5858          || progress.ProgressState == ProgressState.Finished) {
    5959        progress.ProgressStateChanged -= OnProgressStateChanged;
    6060        progress.ProgressValueChanged -= OnProgressValueChanged;
    61         progress.StatusChanged -= OnProgressStatusChanged;
     61        progress.MessageChanged -= OnProgressStatusChanged;
    6262        progressBar.Visible = false;
    6363        progressLabel.Visible = false;
     
    7474      if (InvokeRequired) { Invoke((Action<object, EventArgs>)OnProgressStatusChanged, sender, e); return; }
    7575      var progress = (IProgress)sender;
    76       progressLabel.Text = progress.Status.Replace(Environment.NewLine, "   ");
     76      progressLabel.Text = progress.Message.Replace(Environment.NewLine, "   ");
    7777    }
    7878
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Toolbar/DownloadFromOKBToolbarItem.cs

    r13767 r16958  
    2020#endregion
    2121
     22using System;
     23using System.Drawing;
    2224using HeuristicLab.Common;
    2325using HeuristicLab.MainForm;
    24 using System;
    25 using System.Drawing;
    2626
    2727namespace HeuristicLab.OptimizationExpertSystem.Toolbar {
     
    6666    private void DownloadProgressOnStateChanged(object sender, EventArgs eventArgs) {
    6767      var progress = (IProgress)sender;
    68       if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.Canceled) {
     68      if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.CancelRequested) {
    6969        SetToolStripItemEnabled(true);
    7070        progress.ProgressStateChanged -= DownloadProgressOnStateChanged;
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterAllinOneView.cs

    r13774 r16958  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.ComponentModel;
     25using System.Linq;
     26using System.Text.RegularExpressions;
     27using System.Windows.Forms;
     28using System.Windows.Forms.DataVisualization.Charting;
    2229using HeuristicLab.Analysis;
    2330using HeuristicLab.Analysis.QualityAnalysis;
     
    3441using HeuristicLab.Optimization.Views;
    3542using HeuristicLab.OptimizationExpertSystem.Common;
    36 using System;
    37 using System.Collections.Generic;
    38 using System.ComponentModel;
    39 using System.Linq;
    40 using System.Text.RegularExpressions;
    41 using System.Windows.Forms;
    42 using System.Windows.Forms.DataVisualization.Charting;
    4343
    4444namespace HeuristicLab.OptimizationExpertSystem {
     
    224224      progress.ProgressStateChanged += OkbDownloadProgressOnStateChanged;
    225225      Content.UpdateKnowledgeBaseAsync(progress);
    226       MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(progressPanel, progress);
     226      Progress.ShowOnControl(progressPanel, progress);
    227227      progressPanel.Visible = true;
    228228      SetEnabledStateOfControls();
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterViewBase.cs

    r13787 r16958  
    2020#endregion
    2121
     22using System;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.MainForm;
     
    2526using HeuristicLab.Optimization;
    2627using HeuristicLab.OptimizationExpertSystem.Common;
    27 using System;
    2828
    2929namespace HeuristicLab.OptimizationExpertSystem {
     
    146146    private void ContentOnDownloadStarted(object sender, EventArgs<IProgress> e) {
    147147      if (InvokeRequired) { Invoke((Action<object, EventArgs<IProgress>>)ContentOnDownloadStarted, sender, e); return; }
    148       MainForm.AddOperationProgressToView(this, e.Value);
     148      //MainForm.AddOperationProgressToView(this, e.Value);
    149149      e.Value.ProgressStateChanged += ProgressOnStateChanged;
    150150      OnDownloadStarted(e.Value);
  • branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Views/PerformanceModelingView.cs

    r13878 r16958  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Linq;
     25using System.Threading.Tasks;
    2226using HeuristicLab.Analysis;
    2327using HeuristicLab.Common.Resources;
     
    2832using HeuristicLab.OptimizationExpertSystem.Common;
    2933using HeuristicLab.PluginInfrastructure;
    30 using System;
    31 using System.Collections.Generic;
    32 using System.Linq;
    33 using System.Threading.Tasks;
    3434
    3535namespace HeuristicLab.OptimizationExpertSystem {
     
    153153    private void xValidateButton_Click(object sender, EventArgs e) {
    154154      var recommender = (IAlgorithmInstanceRecommender)recommenderComboBox.SelectedItem;
    155       var progress = MainForm.AddOperationProgressToView(this, "Performing Leave-one-out Crossvalidation");
     155      var progress = Progress.ShowOnControl(this, "Performing Leave-one-out Crossvalidation");
    156156      var topN = (int)topNComboBox.SelectedItem;
    157157      Task.Factory.StartNew(() => { DoCrossvalidate(recommender, topN, progress); }, TaskCreationOptions.LongRunning);
     
    188188          var observed = Content.GetAlgorithmPerformanceLog10(pi);
    189189          if (observed.Count == 0) continue;
    190           progress.Status = pi.Name + "...";
     190          progress.Message = pi.Name + "...";
    191191          var model = recommender.TrainModel(trainingSet.Where(x => x != pi).ToArray(), Content, features);
    192192          var predictedTopN = model.GetRanking(pi).Take(topN).ToDictionary(x => x.Key, x => Math.Log10(x.Value));
  • branches/2457_ExpertSystem/ProblemInstanceIdentifier/App.config

    r14678 r16958  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<configuration>
    33    <startup>
    4         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     4        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
    55    </startup>
    66</configuration>
  • branches/2457_ExpertSystem/ProblemInstanceIdentifier/ProblemInstanceIdentifier.csproj

    r16096 r16958  
    1010    <RootNamespace>ProblemInstanceIdentifier</RootNamespace>
    1111    <AssemblyName>ProblemInstanceIdentifier</AssemblyName>
    12     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/2457_ExpertSystem/UnitTests/UnitTests.csproj

    r16137 r16958  
    1010    <RootNamespace>UnitTests</RootNamespace>
    1111    <AssemblyName>UnitTests</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     
    2020    <NuGetPackageImportStamp>
    2121    </NuGetPackageImportStamp>
     22    <TargetFrameworkProfile />
    2223  </PropertyGroup>
    2324  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/2457_ExpertSystem/WalkExporter/App.config

    r16955 r16958  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<configuration>
    33    <startup>
    4         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     4        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
    55    </startup>
    66</configuration>
  • branches/2457_ExpertSystem/WalkExporter/WalkExporter.csproj

    r16955 r16958  
    99    <RootNamespace>WalkExporter</RootNamespace>
    1010    <AssemblyName>WalkExporter</AssemblyName>
    11     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     11    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1212    <FileAlignment>512</FileAlignment>
     13    <TargetFrameworkProfile />
    1314  </PropertyGroup>
    1415  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/2457_ExpertSystem/WalkExporter/packages.config

    r16955 r16958  
    22<packages>
    33  <package id="protobuf-net" version="2.4.0" targetFramework="net45" />
    4   <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" />
     4  <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" requireReinstallation="true" />
    55</packages>
Note: See TracChangeset for help on using the changeset viewer.