- Timestamp:
- 05/15/19 14:52:20 (6 years ago)
- Location:
- branches/2457_ExpertSystem
- Files:
-
- 58 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape ¶
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape merged eligible
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/AdaptiveWalk.cs ¶
r13583 r16958 20 20 #endregion 21 21 22 using System.Linq; 23 using HEAL.Attic; 22 24 using HeuristicLab.Common; 23 25 using HeuristicLab.Core; 24 26 using HeuristicLab.Data; 25 27 using HeuristicLab.Parameters; 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;27 28 using HeuristicLab.Selection; 28 using System.Linq;29 29 30 30 namespace HeuristicLab.Analysis.FitnessLandscape { 31 31 [Item("Adaptive Walk", "An adaptive walk applies a certain manipulation operation always taking the best of the sample.")] 32 [Storable Class]32 [StorableType("872681B9-5489-4DEF-A6B2-F5663C58E108")] 33 33 [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 303)] 34 34 public sealed class AdaptiveWalk : LocalAnalysis<BestSelector> { … … 39 39 40 40 [StorableConstructor] 41 private AdaptiveWalk( bool deserializing) : base(deserializing) { }41 private AdaptiveWalk(StorableConstructorFlag _) : base(_) { } 42 42 private AdaptiveWalk(AdaptiveWalk original, Cloner cloner) : base(original, cloner) { } 43 43 public AdaptiveWalk() -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/LocalAnalysis.cs ¶
r13920 r16958 20 20 #endregion 21 21 22 using System; 23 using System.Linq; 24 using HEAL.Attic; 22 25 using HeuristicLab.Common; 23 26 using HeuristicLab.Core; … … 27 30 using HeuristicLab.Optimization.Operators; 28 31 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 32 using HeuristicLab.Random; 31 using System;32 using System.Linq;33 33 34 34 namespace HeuristicLab.Analysis.FitnessLandscape { 35 35 [Item("Local Analysis", "A local analysis algorithm.")] 36 [Storable Class]36 [StorableType("2D91C41A-81F8-4EDC-8FD9-F9AE8F4BDA1D")] 37 37 public abstract class LocalAnalysis<T> : HeuristicOptimizationEngineAlgorithm, IStorableContent where T : class, IOperator, new() { 38 38 public string Filename { get; set; } … … 100 100 101 101 [StorableConstructor] 102 protected LocalAnalysis( bool deserializing) : base(deserializing) { }102 protected LocalAnalysis(StorableConstructorFlag _) : base(_) { } 103 103 protected LocalAnalysis(LocalAnalysis<T> original, Cloner cloner) 104 104 : base(original, cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/LocalAnalysisMainLoop.cs ¶
r13583 r16958 20 20 #endregion 21 21 22 using HEAL.Attic; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Core; … … 27 28 using HeuristicLab.Optimization.Operators; 28 29 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 using HeuristicLab.Selection; 31 31 … … 35 35 /// </summary> 36 36 [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 [Storable Class]37 [StorableType("EA4AD808-4F92-4179-8828-F3D86116FC9F")] 38 38 public class LocalAnalysisMainLoop : AlgorithmOperator { 39 39 … … 72 72 73 73 [StorableConstructor] 74 protected LocalAnalysisMainLoop( bool deserializing) : base(deserializing) { }74 protected LocalAnalysisMainLoop(StorableConstructorFlag _) : base(_) { } 75 75 protected LocalAnalysisMainLoop(LocalAnalysisMainLoop original, Cloner cloner) : base(original, cloner) { } 76 76 public LocalAnalysisMainLoop() -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/RandomWalk.cs ¶
r13583 r16958 20 20 #endregion 21 21 22 using System.Linq; 23 using HEAL.Attic; 22 24 using HeuristicLab.Common; 23 25 using HeuristicLab.Core; 24 26 using HeuristicLab.Data; 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;26 27 using HeuristicLab.Selection; 27 using System.Linq;28 28 29 29 namespace HeuristicLab.Analysis.FitnessLandscape { 30 30 [Item("Random Walk", "A random walk applies a certain manipulation operation over and over.")] 31 [Storable Class]31 [StorableType("2997A654-7B98-4979-939D-D07A5D06D77C")] 32 32 [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 301)] 33 33 public sealed class RandomWalk : LocalAnalysis<RandomSelector> { 34 34 35 35 [StorableConstructor] 36 private RandomWalk( bool deserializing) : base(deserializing) { }36 private RandomWalk(StorableConstructorFlag _) : base(_) { } 37 37 private RandomWalk(RandomWalk original, Cloner cloner) : base(original, cloner) { } 38 38 public RandomWalk() -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/UpDownWalk.cs ¶
r13583 r16958 20 20 #endregion 21 21 22 using HEAL.Attic; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Core; 24 25 using HeuristicLab.Data; 25 26 using HeuristicLab.Parameters; 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;27 27 28 28 namespace HeuristicLab.Analysis.FitnessLandscape { 29 29 [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 [Storable Class]30 [StorableType("81877EC4-294E-474A-8E48-6E37D0B702BC")] 31 31 [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 302)] 32 32 public sealed class UpDownWalk : LocalAnalysis<UpDownSelector> { … … 37 37 38 38 [StorableConstructor] 39 private UpDownWalk( bool deserializing) : base(deserializing) { }39 private UpDownWalk(StorableConstructorFlag _) : base(_) { } 40 40 private UpDownWalk(UpDownWalk original, Cloner cloner) : base(original, cloner) { } 41 41 public UpDownWalk() -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/FitnessCloudAnalyzer.cs ¶
r13583 r16958 22 22 using System.Drawing; 23 23 using System.Linq; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; … … 27 28 using HeuristicLab.Optimization.Operators; 28 29 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape { 32 32 33 [Storable Class]33 [StorableType("4156976F-4E61-48BA-B598-FEA872F2E948")] 34 34 public class FitnessCloudAnalyzer : AlgorithmOperator, IQualityTrailAnalyzer { 35 35 public bool EnabledByDefault { … … 50 50 51 51 [StorableConstructor] 52 protected FitnessCloudAnalyzer( bool deserializing) : base(deserializing) { }52 protected FitnessCloudAnalyzer(StorableConstructorFlag _) : base(_) { } 53 53 protected FitnessCloudAnalyzer(FitnessCloudAnalyzer original, Cloner cloner) : base(original, cloner) { } 54 54 -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/InformationAnalyzer.cs ¶
r16955 r16958 21 21 22 22 using System.Linq; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; … … 27 28 using HeuristicLab.Optimization; 28 29 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape { 32 32 33 [Storable Class]33 [StorableType("57803A7A-E1A7-4AD8-9F32-D97F5983ACBD")] 34 34 public class InformationAnalyzer : SingleSuccessorOperator, IQualityTrailAnalyzer { 35 35 public bool EnabledByDefault { … … 83 83 84 84 [StorableConstructor] 85 protected InformationAnalyzer( bool deserializing) : base(deserializing) { }85 protected InformationAnalyzer(StorableConstructorFlag _) : base(_) { } 86 86 protected InformationAnalyzer(InformationAnalyzer original, Cloner cloner) : base(original, cloner) { } 87 87 -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/QualityTrailMultiAnalyzer.cs ¶
r13583 r16958 20 20 #endregion 21 21 22 using System.Linq; 23 using HEAL.Attic; 22 24 using HeuristicLab.Common; 23 25 using HeuristicLab.Core; … … 26 28 using HeuristicLab.Optimization; 27 29 using HeuristicLab.Parameters; 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;29 30 using HeuristicLab.PluginInfrastructure; 30 using System.Linq;31 31 32 32 namespace HeuristicLab.Analysis.FitnessLandscape { 33 33 [Item("QualityTrailAnalyzer", "An analyzer that creates a quality trail which can be further analyzed by several analyzers.")] 34 [Storable Class]34 [StorableType("E02FC8FB-85AD-42AB-8E14-EA509579C8BE")] 35 35 public class QualityTrailMultiAnalyzer : CheckedMultiOperator<IQualityTrailAnalyzer>, IAnalyzer { 36 36 public bool EnabledByDefault { … … 67 67 68 68 [StorableConstructor] 69 protected QualityTrailMultiAnalyzer( bool deserializing) : base(deserializing) { }69 protected QualityTrailMultiAnalyzer(StorableConstructorFlag _) : base(_) { } 70 70 protected QualityTrailMultiAnalyzer(QualityTrailMultiAnalyzer original, Cloner cloner) : base(original, cloner) { } 71 71 public QualityTrailMultiAnalyzer() -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/RuggednessAnalyzer.cs ¶
r16096 r16958 21 21 22 22 using System.Linq; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; … … 27 28 using HeuristicLab.Optimization; 28 29 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape { 32 32 [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 [Storable Class]33 [StorableType("F018AA6C-B392-4D10-8817-D058D7678149")] 34 34 public class RuggednessAnalyzer : SingleSuccessorOperator, IQualityTrailAnalyzer { 35 35 public bool EnabledByDefault { … … 56 56 57 57 [StorableConstructor] 58 protected RuggednessAnalyzer( bool deserializing) : base(deserializing) { }58 protected RuggednessAnalyzer(StorableConstructorFlag _) : base(_) { } 59 59 protected RuggednessAnalyzer(RuggednessAnalyzer original, Cloner cloner) : base(original, cloner) { } 60 60 public RuggednessAnalyzer() { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/UpDownWalkAnalyzer.cs ¶
r16096 r16958 21 21 22 22 using System.Linq; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; … … 27 28 using HeuristicLab.Optimization; 28 29 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape { 32 32 [Item("Up/Down Walk Analyzer", "Analyzes the quality trail produced from an up/down walk.")] 33 [Storable Class]33 [StorableType("0D054A87-A040-4DC5-A722-0952EE96C924")] 34 34 public class UpDownWalkAnalyzer : SingleSuccessorOperator, IQualityTrailAnalyzer { 35 35 public bool EnabledByDefault { … … 65 65 66 66 [StorableConstructor] 67 protected UpDownWalkAnalyzer( bool deserializing) : base(deserializing) { }67 protected UpDownWalkAnalyzer(StorableConstructorFlag _) : base(_) { } 68 68 protected UpDownWalkAnalyzer(UpDownWalkAnalyzer original, Cloner cloner) : base(original, cloner) { } 69 69 public UpDownWalkAnalyzer() { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/AdaptiveWalkCalculator.cs ¶
r16137 r16958 22 22 using System.Collections.Generic; 23 23 using System.Linq; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; 26 27 using HeuristicLab.Data; 27 28 using HeuristicLab.Optimization; 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;29 29 30 30 namespace HeuristicLab.Analysis.FitnessLandscape { 31 31 [Item("Adaptive Walk Calculator", "Calculates characteristics from an adaptive walk.")] 32 [Storable Class]32 [StorableType("C7E8743D-572E-43DC-A4F3-8044CA4E412E")] 33 33 public sealed class AdaptiveWalkCalculator : AlgorithmCharacteristicCalculator<AdaptiveWalk> { 34 34 35 35 [StorableConstructor] 36 private AdaptiveWalkCalculator( bool deserializing) : base(deserializing) { }36 private AdaptiveWalkCalculator(StorableConstructorFlag _) : base(_) { } 37 37 private AdaptiveWalkCalculator(AdaptiveWalkCalculator original, Cloner cloner) 38 38 : base(original, cloner) { } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/AlgorithmCharacteristicCalculator.cs ¶
r16137 r16958 21 21 22 22 using System.Collections.Generic; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; 25 26 using HeuristicLab.Optimization; 26 27 using HeuristicLab.Parameters; 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;28 28 29 29 namespace HeuristicLab.Analysis.FitnessLandscape { 30 [Storable Class]30 [StorableType("19468006-B8AE-485A-BECC-2E4DD0A0B059")] 31 31 public abstract class AlgorithmCharacteristicCalculator<TAlgorithm> : CharacteristicCalculator 32 32 where TAlgorithm : class, IAlgorithm { … … 49 49 50 50 [StorableConstructor] 51 protected AlgorithmCharacteristicCalculator( bool deserializing) : base(deserializing) { }51 protected AlgorithmCharacteristicCalculator(StorableConstructorFlag _) : base(_) { } 52 52 protected AlgorithmCharacteristicCalculator(AlgorithmCharacteristicCalculator<TAlgorithm> original, Cloner cloner) 53 53 : base(original, cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/CharacteristicCalculator.cs ¶
r16137 r16958 21 21 22 22 using System.Collections.Generic; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; 25 26 using HeuristicLab.Data; 26 27 using HeuristicLab.Optimization; 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;28 28 29 29 namespace HeuristicLab.Analysis.FitnessLandscape { 30 30 [Item("Characteristic Calculator", "")] 31 [Storable Class]31 [StorableType("108AEE01-0E47-42EF-9113-D118DA405215")] 32 32 public abstract class CharacteristicCalculator : ParameterizedNamedItem, ICharacteristicCalculator { 33 33 … … 44 44 45 45 [StorableConstructor] 46 protected CharacteristicCalculator( bool deserializing) : base(deserializing) { }46 protected CharacteristicCalculator(StorableConstructorFlag _) : base(_) { } 47 47 protected CharacteristicCalculator(CharacteristicCalculator original, Cloner cloner) 48 48 : base(original, cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/FLACharacterizer.cs ¶
r16137 r16958 22 22 using System; 23 23 using System.Threading; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;27 27 using HeuristicLab.Optimization; 28 28 using HeuristicLab.Parameters; … … 30 30 namespace HeuristicLab.Analysis.FitnessLandscape { 31 31 [Item("FLA Characterizer", "An algorithm that executes a characteristic calculator.")] 32 [Storable Class]32 [StorableType("9843C276-463D-4B79-A44B-7BD1F3B23FB6")] 33 33 [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 300)] 34 34 public sealed class FLACharacterizer : BasicAlgorithm { … … 44 44 45 45 [StorableConstructor] 46 private FLACharacterizer( bool deserializing) : base(deserializing) { }46 private FLACharacterizer(StorableConstructorFlag _) : base(_) { } 47 47 private FLACharacterizer(FLACharacterizer original, Cloner cloner) 48 48 : base(original, cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/QAP/QAPCharacteristicCalculator.cs ¶
r16137 r16958 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HEAL.Attic; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; 27 28 using HeuristicLab.Data; 28 29 using HeuristicLab.Optimization; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 using HeuristicLab.Problems.QuadraticAssignment; 31 31 32 32 namespace HeuristicLab.Analysis.FitnessLandscape { 33 33 [Item("QAP Characteristic Calculator", "")] 34 [Storable Class]34 [StorableType("84B82178-F412-412B-B388-4288AA15B11D")] 35 35 public sealed class QAPCharacteristicCalculator : CharacteristicCalculator { 36 36 37 37 [StorableConstructor] 38 private QAPCharacteristicCalculator( bool deserializing) : base(deserializing) { }38 private QAPCharacteristicCalculator(StorableConstructorFlag _) : base(_) { } 39 39 private QAPCharacteristicCalculator(QAPCharacteristicCalculator original, Cloner cloner) : base(original, cloner) { } 40 40 public QAPCharacteristicCalculator() { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/QAP/QAPDirectedWalk.cs ¶
r16137 r16958 24 24 using System.Linq; 25 25 using System.Threading; 26 using HEAL.Attic; 26 27 using HeuristicLab.Common; 27 28 using HeuristicLab.Core; … … 30 31 using HeuristicLab.Optimization; 31 32 using HeuristicLab.Parameters; 32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;33 33 using HeuristicLab.Problems.QuadraticAssignment; 34 34 using HeuristicLab.Random; … … 36 36 namespace HeuristicLab.Analysis.FitnessLandscape { 37 37 [Item("Directed Walk (QAP-specific)", "")] 38 [Storable Class]38 [StorableType("273C15EA-8362-4F36-AA94-5773A4FE8717")] 39 39 public class QAPDirectedWalk : CharacteristicCalculator { 40 40 … … 80 80 81 81 [StorableConstructor] 82 private QAPDirectedWalk( bool deserializing) : base(deserializing) { }82 private QAPDirectedWalk(StorableConstructorFlag _) : base(_) { } 83 83 private QAPDirectedWalk(QAPDirectedWalk original, Cloner cloner) : base(original, cloner) { } 84 84 public QAPDirectedWalk() { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/RandomWalkCalculator.cs ¶
r16137 r16958 22 22 using System.Collections.Generic; 23 23 using System.Linq; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; 26 27 using HeuristicLab.Data; 27 28 using HeuristicLab.Optimization; 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;29 29 30 30 namespace HeuristicLab.Analysis.FitnessLandscape { 31 31 [Item("Random Walk Calculator", "Calculates characteristics from a random walk.")] 32 [Storable Class]32 [StorableType("FF8080CA-5E93-4390-8184-67B92EBF5ACD")] 33 33 public sealed class RandomWalkCalculator : AlgorithmCharacteristicCalculator<RandomWalk> { 34 34 35 35 [StorableConstructor] 36 private RandomWalkCalculator( bool deserializing) : base(deserializing) { }36 private RandomWalkCalculator(StorableConstructorFlag _) : base(_) { } 37 37 private RandomWalkCalculator(RandomWalkCalculator original, Cloner cloner) : base(original, cloner) { } 38 38 public RandomWalkCalculator() : this(new RandomWalk()) { } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/UpDownWalkCalculator.cs ¶
r16137 r16958 22 22 using System.Collections.Generic; 23 23 using System.Linq; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; 26 27 using HeuristicLab.Data; 27 28 using HeuristicLab.Optimization; 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;29 29 30 30 namespace HeuristicLab.Analysis.FitnessLandscape { 31 31 [Item("Up/Down Walk Calculator", "Calculates characteristics from an up/down walk.")] 32 [Storable Class]32 [StorableType("3DDC32D3-A1F8-4A59-9AF1-48AFFC50B4E4")] 33 33 public sealed class UpDownWalkCalculator : AlgorithmCharacteristicCalculator<UpDownWalk> { 34 34 35 35 [StorableConstructor] 36 private UpDownWalkCalculator( bool deserializing) : base(deserializing) { }36 private UpDownWalkCalculator(StorableConstructorFlag _) : base(_) { } 37 37 private UpDownWalkCalculator(UpDownWalkCalculator original, Cloner cloner) : base(original, cloner) { } 38 38 public UpDownWalkCalculator() : this(new UpDownWalk()) { } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/BinaryVectorDistanceCalculator.cs ¶
r13583 r16958 22 22 using System; 23 23 using System.Drawing; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Common.Resources; 26 27 using HeuristicLab.Core; 27 28 using HeuristicLab.Encodings.BinaryVectorEncoding; 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;29 29 30 30 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators { 31 31 32 32 [Item("BinaryVectorDistanceCalculator", "Calculates the hamming distance of two binary vectors")] 33 [Storable Class]33 [StorableType("BB6A8FD8-22B1-41CC-B38D-C8C9A2B79C83")] 34 34 public class BinaryVectorDistanceCalculator : NamedItem, IItemDistanceCalculator { 35 35 … … 45 45 46 46 [StorableConstructor] 47 protected BinaryVectorDistanceCalculator( bool deserializing) : base(deserializing) { }47 protected BinaryVectorDistanceCalculator(StorableConstructorFlag _) : base(_) { } 48 48 49 49 protected BinaryVectorDistanceCalculator(BinaryVectorDistanceCalculator original, Cloner cloner) -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/IItemDistanceCalculator.cs ¶
r13583 r16958 21 21 22 22 using System; 23 using HEAL.Attic; 23 24 using HeuristicLab.Core; 24 25 25 26 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators { 27 [StorableType("79CBD877-B9E9-4CFE-B1E3-5FCF0DB17EF1")] 26 28 public interface IItemDistanceCalculator : IItem { 27 29 Type ItemType { get; } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/PermutationDistanceCalculator.cs ¶
r13583 r16958 23 23 using System.Collections.Generic; 24 24 using System.Drawing; 25 using HEAL.Attic; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Common.Resources; 27 28 using HeuristicLab.Core; 28 29 using HeuristicLab.Encodings.PermutationEncoding; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators { 32 32 33 33 [Item("PermutationDistanceCalculator", "Calculates the distance of two permutations")] 34 [Storable Class]34 [StorableType("F2B93749-3059-4D37-91A5-FAE2DC9DB794")] 35 35 public class PermutationDistanceCalculator : NamedItem, IItemDistanceCalculator { 36 36 … … 46 46 47 47 [StorableConstructor] 48 protected PermutationDistanceCalculator( bool deserializing) : base(deserializing) { }48 protected PermutationDistanceCalculator(StorableConstructorFlag _) : base(_) { } 49 49 50 50 protected PermutationDistanceCalculator(PermutationDistanceCalculator original, Cloner cloner) -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/RealVectorDistanceCalculator.cs ¶
r13583 r16958 22 22 using System; 23 23 using System.Drawing; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Common.Resources; … … 27 28 using HeuristicLab.Encodings.BinaryVectorEncoding; 28 29 using HeuristicLab.Encodings.RealVectorEncoding; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators { 32 32 33 33 [Item("RealVectorDistanceCalculator", "Calculates the Euclidian distance of two real vectors")] 34 [Storable Class]34 [StorableType("26271DB0-0868-4363-84AE-46CF583276F0")] 35 35 public class RealVectorDistanceCalculator : NamedItem, IItemDistanceCalculator { 36 36 … … 46 46 47 47 [StorableConstructor] 48 protected RealVectorDistanceCalculator( bool deserializing) : base(deserializing) { }48 protected RealVectorDistanceCalculator(StorableConstructorFlag _) : base(_) { } 49 49 50 50 protected RealVectorDistanceCalculator(RealVectorDistanceCalculator original, Cloner cloner) -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/BinaryVectorFitnessDistanceCorrelationAnalyzer.cs ¶
r7128 r16958 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HEAL.Attic; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; 27 28 using HeuristicLab.Encodings.BinaryVectorEncoding; 28 29 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape { 32 32 33 33 [Item("BinaryVectorFitnessDistanceCorrelationAnalyzer", "An operator that analyzes the correlation between fitness and distance to the best know solution for binary vector encoding")] 34 [Storable Class]34 [StorableType("BE5474B1-9D8E-4AA0-9236-85C192712A96")] 35 35 public class BinaryVectorFitnessDistanceCorrelationAnalyzer : FitnessDistanceCorrelationAnalyzer, IBinaryVectorOperator { 36 36 … … 45 45 46 46 [StorableConstructor] 47 protected BinaryVectorFitnessDistanceCorrelationAnalyzer( bool deserializing) : base(deserializing) { }47 protected BinaryVectorFitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { } 48 48 protected BinaryVectorFitnessDistanceCorrelationAnalyzer(BinaryVectorFitnessDistanceCorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { } 49 49 -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/FitnessDistanceCorrelationAnalyzer.cs ¶
r7176 r16958 23 23 using System.Drawing; 24 24 using System.Linq; 25 using HEAL.Attic; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; … … 30 31 using HeuristicLab.Optimization.Operators; 31 32 using HeuristicLab.Parameters; 32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;33 33 34 34 namespace HeuristicLab.Analysis.FitnessLandscape { 35 35 36 [Storable Class]36 [StorableType("A603BC77-CAA7-468B-9206-500A196691E7")] 37 37 public abstract class FitnessDistanceCorrelationAnalyzer : AlgorithmOperator, IAnalyzer { 38 38 public bool EnabledByDefault { … … 53 53 54 54 [StorableConstructor] 55 protected FitnessDistanceCorrelationAnalyzer( bool deserializing) : base(deserializing) { }55 protected FitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { } 56 56 protected FitnessDistanceCorrelationAnalyzer(FitnessDistanceCorrelationAnalyzer original, Cloner cloner) 57 57 : base(original, cloner) { } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/PermutationFitnessDistanceCorrelationAnalyzer.cs ¶
r7128 r16958 24 24 using System.Drawing; 25 25 using System.Linq; 26 using HEAL.Attic; 26 27 using HeuristicLab.Common; 27 28 using HeuristicLab.Core; 28 29 using HeuristicLab.Encodings.PermutationEncoding; 29 30 using HeuristicLab.Parameters; 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;31 31 32 32 namespace HeuristicLab.Analysis.FitnessLandscape { 33 33 34 34 [Item("PermutationFitnessDistanceCorrelationAnalyzer", "An operator that analyzes the correlation between fitness and distance to the best know solution for permutation encoding")] 35 [Storable Class]35 [StorableType("2021A1AA-FE98-4D42-8730-23C5EA552B21")] 36 36 public class PermutationFitnessDistanceCorrelationAnalyzer : FitnessDistanceCorrelationAnalyzer, IPermutationOperator { 37 37 … … 46 46 47 47 [StorableConstructor] 48 protected PermutationFitnessDistanceCorrelationAnalyzer( bool deserializing) : base(deserializing) { }48 protected PermutationFitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { } 49 49 protected PermutationFitnessDistanceCorrelationAnalyzer(PermutationFitnessDistanceCorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { } 50 50 -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/QAPPermutationFitnessDistanceCorrelationAnalyzer.cs ¶
r7128 r16958 22 22 using System.Collections.Generic; 23 23 using System.Linq; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; … … 27 28 using HeuristicLab.Encodings.PermutationEncoding; 28 29 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape { 32 32 33 33 [Item("QAPPermutationFitnessDistanceCorrelationAnalyzer", "An operator that analyzes the correlation between fitness and distance to the best know solution for permutation encoding")] 34 [Storable Class]34 [StorableType("31823F7B-55FB-4D57-80EE-89F4D90B6412")] 35 35 public class QAPPermutationFitnessDistanceCorrelationAnalyzer : FitnessDistanceCorrelationAnalyzer, IPermutationOperator { 36 36 … … 51 51 52 52 [StorableConstructor] 53 protected QAPPermutationFitnessDistanceCorrelationAnalyzer( bool deserializing) : base(deserializing) { }53 protected QAPPermutationFitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { } 54 54 protected QAPPermutationFitnessDistanceCorrelationAnalyzer(QAPPermutationFitnessDistanceCorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { } 55 55 -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/RealVectorFitnessDistanceCorrelationAnalyzer.cs ¶
r7128 r16958 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HEAL.Attic; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; 27 28 using HeuristicLab.Encodings.RealVectorEncoding; 28 29 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape { 32 32 33 33 [Item("RealVectorFitnessDistanceCorrelationAnalyzer", "An operator that analyzes the correlation between fitness and distance to the best know solution for real vector encoding")] 34 [Storable Class]34 [StorableType("84EA2C55-F847-4CF9-B966-0E7B9DD8903C")] 35 35 public class RealVectorFitnessDistanceCorrelationAnalyzer : FitnessDistanceCorrelationAnalyzer, IRealVectorOperator { 36 36 … … 45 45 46 46 [StorableConstructor] 47 protected RealVectorFitnessDistanceCorrelationAnalyzer( bool deserializing) : base(deserializing) { }47 protected RealVectorFitnessDistanceCorrelationAnalyzer(StorableConstructorFlag _) : base(_) { } 48 48 protected RealVectorFitnessDistanceCorrelationAnalyzer(RealVectorFitnessDistanceCorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { } 49 49 -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/FDC/ScatterPlot.cs ¶
r7291 r16958 24 24 using System.Drawing; 25 25 using System.Linq; 26 using HEAL.Attic; 26 27 using HeuristicLab.Common; 28 using HeuristicLab.Common.Resources; 27 29 using HeuristicLab.Core; 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HeuristicLab.Common.Resources;30 30 31 31 namespace HeuristicLab.Analysis.FitnessLandscape { … … 39 39 40 40 [Item("ScatterPlot", "A scatter plot of 2D data")] 41 [Storable Class]41 [StorableType("317254F8-A1D9-4675-8292-5CDF078B53BD")] 42 42 public class ScatterPlot : NamedItem { 43 43 … … 121 121 122 122 [StorableConstructor] 123 protected ScatterPlot( bool deserializing) : base(deserializing) { }123 protected ScatterPlot(StorableConstructorFlag _) : base(_) { } 124 124 protected ScatterPlot(ScatterPlot original, Cloner cloner) 125 125 : base(original, cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/HeuristicLab.Analysis.FitnessLandscape-3.3.csproj ¶
r16137 r16958 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.Analysis.FitnessLandscape</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Analysis.FitnessLandscape-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 15 <SignAssembly>true</SignAssembly> … … 94 94 <Reference Include="ALGLIB-3.7.0"> 95 95 <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> 96 101 <Private>False</Private> 97 102 </Reference> -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/DirectedPath.cs ¶
r14678 r16958 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HEAL.Attic; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;28 28 29 29 namespace HeuristicLab.Analysis.FitnessLandscape { 30 30 [Item("Directed Path", "")] 31 [Storable Class]31 [StorableType("4FD1A99C-7858-4AB9-916F-FEE00B4FD66D")] 32 32 public class DirectedPath<T> : Item where T : class, IDeepCloneable { 33 33 [Storable] … … 38 38 39 39 [StorableConstructor] 40 protected DirectedPath( bool deserializing) : base(deserializing) { }40 protected DirectedPath(StorableConstructorFlag _) : base(_) { } 41 41 protected DirectedPath(DirectedPath<T> original, Cloner cloner) 42 42 : base(original, cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/PRProblemInstanceAnalyzer.cs ¶
r14678 r16958 20 20 #endregion 21 21 22 using HEAL.Attic; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Core; 24 using HeuristicLab.Data;25 25 using HeuristicLab.Parameters; 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;27 26 28 27 namespace HeuristicLab.Analysis.FitnessLandscape { 29 28 [Item("Path-Relinking Problem Instance Analyzer", "Tries to identify the current problem instance being solved by analyzing the output of path-relinking heuristics.")] 30 [Storable Class]29 [StorableType("1CBE2C82-1D1F-4C4E-BEC7-40EC914CB6C6")] 31 30 public abstract class PrProblemInstanceAnalyzer<T> : ProblemInstanceAnalyzer where T : class, IDeepCloneable { 32 31 … … 38 37 39 38 [StorableConstructor] 40 protected PrProblemInstanceAnalyzer( bool deserializing) : base(deserializing) { }39 protected PrProblemInstanceAnalyzer(StorableConstructorFlag _) : base(_) { } 41 40 protected PrProblemInstanceAnalyzer(PrProblemInstanceAnalyzer<T> original, Cloner cloner) 42 41 : base(original, cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/ProblemInstanceAnalyzer.cs ¶
r14691 r16958 23 23 using System.Globalization; 24 24 using System.Linq; 25 using HEAL.Attic; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; … … 29 30 using HeuristicLab.Optimization; 30 31 using HeuristicLab.Parameters; 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;32 32 33 33 namespace HeuristicLab.Analysis.FitnessLandscape { 34 34 [Item("Problem Instance Similarity Analyzer", "Base class for analyzing whether certain obtained characteristics match the characteristics of already known problem instances.")] 35 [Storable Class]35 [StorableType("9E5EF806-15D1-44B9-AC0E-01501A62C052")] 36 36 public abstract class ProblemInstanceAnalyzer : SingleSuccessorOperator, IAnalyzer { 37 37 … … 58 58 59 59 [StorableConstructor] 60 protected ProblemInstanceAnalyzer( bool deserializing) : base(deserializing) { }60 protected ProblemInstanceAnalyzer(StorableConstructorFlag _) : base(_) { } 61 61 62 62 protected ProblemInstanceAnalyzer(ProblemInstanceAnalyzer original, Cloner cloner) -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/QAPPRProblemInstanceAnalyzer.cs ¶
r16137 r16958 21 21 22 22 using System.Linq; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; 25 26 using HeuristicLab.Data; 26 27 using HeuristicLab.Encodings.PermutationEncoding; 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;28 28 29 29 namespace HeuristicLab.Analysis.FitnessLandscape { 30 30 [Item("QAP Path-Relinking Problem Instance Analyzer", "")] 31 [Storable Class]31 [StorableType("7A17AAA9-3687-412F-B80F-5517CC2FFE02")] 32 32 public sealed class QAPPRProblemInstanceAnalyzer : PrProblemInstanceAnalyzer<Permutation> { 33 33 34 34 [StorableConstructor] 35 private QAPPRProblemInstanceAnalyzer( bool deserializing) : base(deserializing) { }35 private QAPPRProblemInstanceAnalyzer(StorableConstructorFlag _) : base(_) { } 36 36 private QAPPRProblemInstanceAnalyzer(QAPPRProblemInstanceAnalyzer original, Cloner cloner) : base(original, cloner) { } 37 37 public QAPPRProblemInstanceAnalyzer() { } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/UpDownSelector.cs ¶
r13583 r16958 20 20 #endregion 21 21 22 using System.Collections.Generic; 23 using System.Linq; 24 using HEAL.Attic; 22 25 using HeuristicLab.Common; 23 26 using HeuristicLab.Core; … … 26 29 using HeuristicLab.Optimization; 27 30 using HeuristicLab.Parameters; 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;29 using System.Collections.Generic;30 using System.Linq;31 31 32 32 namespace HeuristicLab.Analysis.FitnessLandscape { 33 33 [Item("Up/DownSelector", "A selection operator that moves towards the next local optimum, when found reverses direction and so on.")] 34 [Storable Class]34 [StorableType("4CECAA0E-CC36-4910-B951-22C78C8EBA91")] 35 35 public class UpDownSelector : InstrumentedOperator, IStochasticOperator { 36 36 … … 56 56 57 57 [StorableConstructor] 58 protected UpDownSelector( bool deserializing) : base(deserializing) { }58 protected UpDownSelector(StorableConstructorFlag _) : base(_) { } 59 59 protected UpDownSelector(UpDownSelector original, Cloner cloner) : base(original, cloner) { } 60 60 public UpDownSelector() { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/BestNScopesSolutionAnalyzer.cs ¶
r13744 r16958 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using HEAL.Attic; 22 26 using HeuristicLab.Common; 23 27 using HeuristicLab.Core; … … 27 31 using HeuristicLab.Optimization.Operators; 28 32 using HeuristicLab.Parameters; 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;30 using System;31 using System.Collections.Generic;32 using System.Linq;33 33 34 34 namespace HeuristicLab.Analysis { … … 37 37 /// </summary> 38 38 [Item("BestNScopesSolutionAnalyzer", "An operator that maintains at most N scopes containing good quality solutions.")] 39 [Storable Class]39 [StorableType("9E9CB06C-EFF2-4A99-9203-E334771FF613")] 40 40 public class BestNScopesSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator { 41 41 … … 82 82 #region Storing & Cloning 83 83 [StorableConstructor] 84 protected BestNScopesSolutionAnalyzer( bool deserializing) : base(deserializing) { }84 protected BestNScopesSolutionAnalyzer(StorableConstructorFlag _) : base(_) { } 85 85 protected BestNScopesSolutionAnalyzer(BestNScopesSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { } 86 86 public override IDeepCloneable Clone(Cloner cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs ¶
r14058 r16958 20 20 #endregion 21 21 22 using System; 23 using System.Linq; 24 using System.Threading; 25 using System.Threading.Tasks; 26 using HEAL.Attic; 22 27 using HeuristicLab.Collections; 23 28 using HeuristicLab.Common; … … 26 31 using HeuristicLab.Optimization; 27 32 using 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;33 33 34 34 namespace HeuristicLab.Analysis { … … 38 38 [Item("Iterated Algorithm", "An algorithm that repeats an algorithm until either a certain target value is reached or a maximum budget is exceeded.")] 39 39 [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 116)] 40 [Storable Class]40 [StorableType("787AF25E-46FF-4FBF-A2ED-011E7F41AF58")] 41 41 public sealed class IteratedAlgorithm : Algorithm, IStorableContent { 42 42 private const string ExecutionTimeResultName = "Execution Time"; … … 166 166 167 167 [StorableConstructor] 168 private IteratedAlgorithm( bool deserializing) : base(deserializing) { }168 private IteratedAlgorithm(StorableConstructorFlag _) : base(_) { } 169 169 private IteratedAlgorithm(IteratedAlgorithm original, Cloner cloner) 170 170 : base(original, cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/SolutionSamplingOperator.cs ¶
r14776 r16958 20 20 #endregion 21 21 22 using System;22 using HEAL.Attic; 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; … … 26 26 using HeuristicLab.Operators; 27 27 using HeuristicLab.Parameters; 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;29 28 30 29 namespace HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel { 31 30 [Item("Solution Sampling Operator", "Creates new solutions by sampling from a given model.")] 32 [Storable Class]31 [StorableType("026C4C5E-8B97-4798-87E7-8B5958BDC79F")] 33 32 public class SolutionSamplingOperator : InstrumentedOperator { 34 33 … … 46 45 47 46 [StorableConstructor] 48 protected SolutionSamplingOperator( bool deserializing) : base() { }47 protected SolutionSamplingOperator(StorableConstructorFlag _) : base(_) { } 49 48 protected SolutionSamplingOperator(SolutionSamplingOperator original, Cloner cloner) 50 49 : base(original, cloner) { } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/Univariate/UnivariateModel.cs ¶
r14776 r16958 21 21 22 22 using System.Linq; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; 25 26 using HeuristicLab.Data; 26 27 using HeuristicLab.Optimization; 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;28 28 29 29 namespace HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel { 30 30 [Item("Univariate solution model (binary)", "")] 31 [Storable Class]31 [StorableType("E30B8452-970C-4AF2-B7E7-4AC9C21928BA")] 32 32 public sealed class UnivariateModel : Item, ISolutionModel<BinaryVector> { 33 33 [Storable] … … 37 37 38 38 [StorableConstructor] 39 private UnivariateModel( bool deserializing) : base(deserializing) { }39 private UnivariateModel(StorableConstructorFlag _) : base(_) { } 40 40 private UnivariateModel(UnivariateModel original, Cloner cloner) 41 41 : base(original, cloner) { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/Univariate/UnivariateModelTrainingOperator.cs ¶
r14776 r16958 22 22 using System; 23 23 using System.Linq; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; … … 28 29 using HeuristicLab.Optimization; 29 30 using HeuristicLab.Parameters; 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;31 31 32 32 namespace HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel { 33 [StorableType("a70d9738-4012-442a-b6b2-b0aa2c34a3c5")] 33 34 public enum ModelBiasOptions { 34 35 Unbiased, … … 38 39 39 40 [Item("Univariate Model Training Operator", "Adds a univariate solution sampling model to the scope.")] 40 [Storable Class]41 [StorableType("CF6BF85A-8AC0-4DF3-8591-671FCBDDB4F2")] 41 42 public class UnivariateModelTrainingOperator : InstrumentedOperator, IStochasticOperator, ISingleObjectiveOperator { 42 43 … … 71 72 72 73 [StorableConstructor] 73 protected UnivariateModelTrainingOperator( bool deserializing) : base() { }74 protected UnivariateModelTrainingOperator(StorableConstructorFlag _) : base(_) { } 74 75 protected UnivariateModelTrainingOperator(UnivariateModelTrainingOperator original, Cloner cloner) 75 76 : base(original, cloner) { } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Creators/PreexistingPermutationCreator.cs ¶
r13713 r16958 20 20 #endregion 21 21 22 using HEAL.Attic; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Core; … … 26 27 using HeuristicLab.Optimization; 27 28 using HeuristicLab.Parameters; 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;29 29 using HeuristicLab.Random; 30 30 … … 34 34 /// </summary> 35 35 [Item("PreexistingPermutationCreator", "An operator which creates a new permutation of integer values from a set of given permutations.")] 36 [Storable Class]36 [StorableType("D6EC71C0-2AC1-461B-B684-13352AC88A8C")] 37 37 public sealed class PreexistingPermutationCreator : InstrumentedOperator, IPermutationCreator, IPreexistingSolutionCreator, IStochasticOperator { 38 38 public override bool CanChangeName { … … 65 65 66 66 [StorableConstructor] 67 private PreexistingPermutationCreator( bool deserializing) : base(deserializing) { }67 private PreexistingPermutationCreator(StorableConstructorFlag _) : base(_) { } 68 68 private PreexistingPermutationCreator(PreexistingPermutationCreator original, Cloner cloner) : base(original, cloner) { } 69 69 public PreexistingPermutationCreator() -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem.Common/3.3/HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj ¶
r15694 r16958 10 10 <RootNamespace>HeuristicLab.OptimizationExpertSystem.Common</RootNamespace> 11 11 <AssemblyName>HeuristicLab.OptimizationExpertSystem.Common-3.3</AssemblyName> 12 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 <TargetFrameworkProfile /> 14 15 </PropertyGroup> 15 16 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> … … 77 78 <Private>False</Private> 78 79 </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> 79 85 <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4"> 80 86 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath> … … 107 113 <Reference Include="HeuristicLab.MainForm-3.3"> 108 114 <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> 109 120 <Private>False</Private> 110 121 </Reference> -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem.Common/3.3/KnowledgeCenter.cs ¶
r15255 r16958 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.Drawing; 25 using System.IO; 26 using System.Linq; 27 using System.Threading; 28 using System.Threading.Tasks; 29 using HeuristicLab.Algorithms.DataAnalysis; 22 30 using HeuristicLab.Analysis; 23 31 using HeuristicLab.Analysis.SelfOrganizingMaps; … … 32 40 using HeuristicLab.Problems.DataAnalysis; 33 41 using 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;42 42 using Algorithm = HeuristicLab.Clients.OKB.Administration.Algorithm; 43 43 using Problem = HeuristicLab.Clients.OKB.Administration.Problem; … … 403 403 404 404 public Task UpdateKnowledgeBaseAsync(IProgress progress = null) { 405 if (progress == null) progress = new Progress( string.Empty);405 if (progress == null) progress = new Progress(); 406 406 progress.Start("Updating Knowledge Base from OKB"); 407 407 OnDownloadStarted(progress); … … 417 417 var adminClient = Clients.OKB.Administration.AdministrationClient.Instance; 418 418 try { 419 progress. Status= "Connecting to OKB...";419 progress.Message = "Connecting to OKB..."; 420 420 progress.ProgressValue = 0; 421 421 // FIXME: How to tell if refresh is necessary? … … 434 434 435 435 problemId2ProblemInstanceMapping.Clear(); 436 progress. Status= "Downloading algorithm and problem instances...";436 progress.Message = "Downloading algorithm and problem instances..."; 437 437 progress.ProgressValue = 0; 438 438 … … 461 461 var interestingValues = queryClient.ValueNames.Where(x => InterestingValueNames.Contains(x.Name)).ToList(); 462 462 463 progress. Status= "Downloading runs...";463 progress.Message = "Downloading runs..."; 464 464 progress.ProgressValue = 0; 465 465 p[0] = 0; … … 482 482 } 483 483 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); 485 485 p[0] += batch.Count; 486 486 progress.ProgressValue = p[0] / (double)count; 487 487 } 488 488 }); 489 progress. Status= "Finishing...";489 progress.Message = "Finishing..."; 490 490 491 491 // remove algorithm instances that do not appear in any downloaded run … … 556 556 algorithmInstances.Add(alg); 557 557 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); 559 559 p[0]++; 560 560 progress.ProgressValue = p[0] / (double)total; … … 587 587 problemId2ProblemInstanceMapping.Add(pInst.Id, probRun); 588 588 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); 590 590 p[0]++; 591 591 progress.ProgressValue = p[0] / (double)totalProblems; … … 628 628 runList.Add(r.Item3); 629 629 } 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); 631 631 progress.ProgressValue = (double)runList.Count / total; 632 632 } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/KNearestNeighborRecommender.cs ¶
r15255 r16958 20 20 #endregion 21 21 22 using System.Linq; 23 using HEAL.Attic; 22 24 using HeuristicLab.Common; 23 25 using HeuristicLab.Core; … … 25 27 using HeuristicLab.Optimization; 26 28 using HeuristicLab.Parameters; 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;28 using System.Linq;29 29 30 30 namespace HeuristicLab.OptimizationExpertSystem.Common { 31 31 [Item("K-Nearest Neighbor Recommender", "")] 32 [Storable Class]32 [StorableType("A2DB464F-3F1D-47B0-944B-DE252D461A0C")] 33 33 public sealed class KNearestNeighborRecommender : ParameterizedNamedItem, IAlgorithmInstanceRecommender { 34 34 … … 43 43 44 44 [StorableConstructor] 45 private KNearestNeighborRecommender( bool deserializing) : base(deserializing) { }45 private KNearestNeighborRecommender(StorableConstructorFlag _) : base(_) { } 46 46 private KNearestNeighborRecommender(KNearestNeighborRecommender original, Cloner cloner) : base(original, cloner) { } 47 47 public KNearestNeighborRecommender() { -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/OverallBestRecommender.cs ¶
r13803 r16958 29 29 using System.Collections.Generic; 30 30 using System.Linq; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.OptimizationExpertSystem.Common { 33 34 [Item("Overall Best Recommender", "")] 34 [Storable Class]35 [StorableType("CCB14209-4C6F-4C72-A4D9-F803D2232CFB")] 35 36 public class OverallBestRecommender : ParameterizedNamedItem, IAlgorithmInstanceRecommender { 36 37 … … 40 41 41 42 [StorableConstructor] 42 private OverallBestRecommender( bool deserializing) : base(deserializing) { }43 private OverallBestRecommender(StorableConstructorFlag _) : base(_) { } 43 44 private OverallBestRecommender(OverallBestRecommender original, Cloner cloner) : base(original, cloner) { } 44 45 public OverallBestRecommender() { } -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj ¶
r15694 r16958 10 10 <RootNamespace>HeuristicLab.OptimizationExpertSystem</RootNamespace> 11 11 <AssemblyName>HeuristicLab.OptimizationExpertSystem-3.3</AssemblyName> 12 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 <TargetFrameworkProfile /> 14 15 </PropertyGroup> 15 16 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config/30_DownloadFromOkbMenuItem.cs ¶
r13767 r16958 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.Drawing; 22 25 using HeuristicLab.Common; 23 26 using HeuristicLab.Common.Resources; 24 27 using HeuristicLab.MainForm; 25 using System;26 using System.Collections.Generic;27 using System.Drawing;28 28 29 29 namespace HeuristicLab.OptimizationExpertSystem.Menu { … … 72 72 private void DownloadProgressOnStateChanged(object sender, EventArgs eventArgs) { 73 73 var progress = (IProgress)sender; 74 if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.Cancel ed) {74 if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.CancelRequested) { 75 75 SetToolStripItemEnabled(true); 76 76 progress.ProgressStateChanged -= DownloadProgressOnStateChanged; -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/OptimizationKnowledgeCenter.cs ¶
r13748 r16958 20 20 #endregion 21 21 22 using System; 23 using System.Windows.Forms; 22 24 using HeuristicLab.Common; 23 25 using HeuristicLab.MainForm; 24 26 using HeuristicLab.MainForm.WindowsForms; 25 27 using HeuristicLab.OptimizationExpertSystem.Common; 26 using System;27 using System.Windows.Forms;28 28 29 29 namespace HeuristicLab.OptimizationExpertSystem { … … 45 45 e.Value.ProgressStateChanged += OnProgressStateChanged; 46 46 e.Value.ProgressValueChanged += OnProgressValueChanged; 47 e.Value. StatusChanged += OnProgressStatusChanged;47 e.Value.MessageChanged += OnProgressStatusChanged; 48 48 progressBar.Value = progressBar.Minimum; 49 49 progressLabel.Text = string.Empty; … … 55 55 if (InvokeRequired) { Invoke((Action<object, EventArgs>)OnProgressStateChanged, sender, e); return; } 56 56 var progress = (IProgress)sender; 57 if (progress.ProgressState == ProgressState.Cancel ed57 if (progress.ProgressState == ProgressState.CancelRequested 58 58 || progress.ProgressState == ProgressState.Finished) { 59 59 progress.ProgressStateChanged -= OnProgressStateChanged; 60 60 progress.ProgressValueChanged -= OnProgressValueChanged; 61 progress. StatusChanged -= OnProgressStatusChanged;61 progress.MessageChanged -= OnProgressStatusChanged; 62 62 progressBar.Visible = false; 63 63 progressLabel.Visible = false; … … 74 74 if (InvokeRequired) { Invoke((Action<object, EventArgs>)OnProgressStatusChanged, sender, e); return; } 75 75 var progress = (IProgress)sender; 76 progressLabel.Text = progress. Status.Replace(Environment.NewLine, " ");76 progressLabel.Text = progress.Message.Replace(Environment.NewLine, " "); 77 77 } 78 78 -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Toolbar/DownloadFromOKBToolbarItem.cs ¶
r13767 r16958 20 20 #endregion 21 21 22 using System; 23 using System.Drawing; 22 24 using HeuristicLab.Common; 23 25 using HeuristicLab.MainForm; 24 using System;25 using System.Drawing;26 26 27 27 namespace HeuristicLab.OptimizationExpertSystem.Toolbar { … … 66 66 private void DownloadProgressOnStateChanged(object sender, EventArgs eventArgs) { 67 67 var progress = (IProgress)sender; 68 if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.Cancel ed) {68 if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.CancelRequested) { 69 69 SetToolStripItemEnabled(true); 70 70 progress.ProgressStateChanged -= DownloadProgressOnStateChanged; -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterAllinOneView.cs ¶
r13774 r16958 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.ComponentModel; 25 using System.Linq; 26 using System.Text.RegularExpressions; 27 using System.Windows.Forms; 28 using System.Windows.Forms.DataVisualization.Charting; 22 29 using HeuristicLab.Analysis; 23 30 using HeuristicLab.Analysis.QualityAnalysis; … … 34 41 using HeuristicLab.Optimization.Views; 35 42 using 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;43 43 44 44 namespace HeuristicLab.OptimizationExpertSystem { … … 224 224 progress.ProgressStateChanged += OkbDownloadProgressOnStateChanged; 225 225 Content.UpdateKnowledgeBaseAsync(progress); 226 MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(progressPanel, progress);226 Progress.ShowOnControl(progressPanel, progress); 227 227 progressPanel.Visible = true; 228 228 SetEnabledStateOfControls(); -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterViewBase.cs ¶
r13787 r16958 20 20 #endregion 21 21 22 using System; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.MainForm; … … 25 26 using HeuristicLab.Optimization; 26 27 using HeuristicLab.OptimizationExpertSystem.Common; 27 using System;28 28 29 29 namespace HeuristicLab.OptimizationExpertSystem { … … 146 146 private void ContentOnDownloadStarted(object sender, EventArgs<IProgress> e) { 147 147 if (InvokeRequired) { Invoke((Action<object, EventArgs<IProgress>>)ContentOnDownloadStarted, sender, e); return; } 148 MainForm.AddOperationProgressToView(this, e.Value);148 //MainForm.AddOperationProgressToView(this, e.Value); 149 149 e.Value.ProgressStateChanged += ProgressOnStateChanged; 150 150 OnDownloadStarted(e.Value); -
TabularUnified branches/2457_ExpertSystem/HeuristicLab.OptimizationExpertSystem/3.3/Views/PerformanceModelingView.cs ¶
r13878 r16958 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Threading.Tasks; 22 26 using HeuristicLab.Analysis; 23 27 using HeuristicLab.Common.Resources; … … 28 32 using HeuristicLab.OptimizationExpertSystem.Common; 29 33 using HeuristicLab.PluginInfrastructure; 30 using System;31 using System.Collections.Generic;32 using System.Linq;33 using System.Threading.Tasks;34 34 35 35 namespace HeuristicLab.OptimizationExpertSystem { … … 153 153 private void xValidateButton_Click(object sender, EventArgs e) { 154 154 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"); 156 156 var topN = (int)topNComboBox.SelectedItem; 157 157 Task.Factory.StartNew(() => { DoCrossvalidate(recommender, topN, progress); }, TaskCreationOptions.LongRunning); … … 188 188 var observed = Content.GetAlgorithmPerformanceLog10(pi); 189 189 if (observed.Count == 0) continue; 190 progress. Status= pi.Name + "...";190 progress.Message = pi.Name + "..."; 191 191 var model = recommender.TrainModel(trainingSet.Where(x => x != pi).ToArray(), Content, features); 192 192 var predictedTopN = model.GetRanking(pi).Take(topN).ToDictionary(x => x.Key, x => Math.Log10(x.Value)); -
TabularUnified branches/2457_ExpertSystem/ProblemInstanceIdentifier/App.config ¶
r14678 r16958 1 <?xml version="1.0" encoding="utf-8"?>1 <?xml version="1.0" encoding="utf-8"?> 2 2 <configuration> 3 3 <startup> 4 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4. 5.2"/>4 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/> 5 5 </startup> 6 6 </configuration> -
TabularUnified branches/2457_ExpertSystem/ProblemInstanceIdentifier/ProblemInstanceIdentifier.csproj ¶
r16096 r16958 10 10 <RootNamespace>ProblemInstanceIdentifier</RootNamespace> 11 11 <AssemblyName>ProblemInstanceIdentifier</AssemblyName> 12 <TargetFrameworkVersion>v4. 5.2</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> 15 <TargetFrameworkProfile /> 15 16 </PropertyGroup> 16 17 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> -
TabularUnified branches/2457_ExpertSystem/UnitTests/UnitTests.csproj ¶
r16137 r16958 10 10 <RootNamespace>UnitTests</RootNamespace> 11 11 <AssemblyName>UnitTests</AssemblyName> 12 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> … … 20 20 <NuGetPackageImportStamp> 21 21 </NuGetPackageImportStamp> 22 <TargetFrameworkProfile /> 22 23 </PropertyGroup> 23 24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> -
TabularUnified branches/2457_ExpertSystem/WalkExporter/App.config ¶
r16955 r16958 1 <?xml version="1.0" encoding="utf-8"?>1 <?xml version="1.0" encoding="utf-8"?> 2 2 <configuration> 3 3 <startup> 4 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4. 5"/>4 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/> 5 5 </startup> 6 6 </configuration> -
TabularUnified branches/2457_ExpertSystem/WalkExporter/WalkExporter.csproj ¶
r16955 r16958 9 9 <RootNamespace>WalkExporter</RootNamespace> 10 10 <AssemblyName>WalkExporter</AssemblyName> 11 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>11 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 12 12 <FileAlignment>512</FileAlignment> 13 <TargetFrameworkProfile /> 13 14 </PropertyGroup> 14 15 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> -
TabularUnified branches/2457_ExpertSystem/WalkExporter/packages.config ¶
r16955 r16958 2 2 <packages> 3 3 <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" /> 5 5 </packages>
Note: See TracChangeset
for help on using the changeset viewer.