Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Timestamp:
- 03/28/19 16:54:20 (6 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 85 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/BestSymbolicExpressionTreeAnalyzer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Optimization; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 using HeuristicLab.PluginInfrastructure; 30 30 … … 34 34 /// </summary> 35 35 [Item("BestSymbolicExpressionTreeAnalyzer", "An operator that tracks the best symbolic expression trees")] 36 [Storable Class]36 [StorableType("6C1884A9-F954-4E64-97DA-8831E2FF1561")] 37 37 [NonDiscoverableType] 38 38 public sealed class BestSymbolicExpressionTreeAnalyzer : SingleSuccessorOperator, ISymbolicExpressionTreeAnalyzer { … … 68 68 69 69 [StorableConstructor] 70 private BestSymbolicExpressionTreeAnalyzer( bool deserializing) : base(deserializing) { }70 private BestSymbolicExpressionTreeAnalyzer(StorableConstructorFlag _) : base(_) { } 71 71 private BestSymbolicExpressionTreeAnalyzer(BestSymbolicExpressionTreeAnalyzer original, Cloner cloner) 72 72 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/MinAverageMaxSymbolicExpressionTreeLengthAnalyzer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Operators; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 34 34 /// </summary> 35 35 [Item("MinAverageMaxSymbolicExpressionTreeLengthAnalyzer", "An operator that tracks the min avgerage and max length of symbolic expression trees.")] 36 [Storable Class]36 [StorableType("65606B5F-4F92-4E79-9B53-9A72398A9F1B")] 37 37 public sealed class MinAverageMaxSymbolicExpressionTreeLengthAnalyzer : AlgorithmOperator, ISymbolicExpressionTreeAnalyzer { 38 38 private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree"; … … 70 70 71 71 [StorableConstructor] 72 private MinAverageMaxSymbolicExpressionTreeLengthAnalyzer( bool deserializing) : base() { }72 private MinAverageMaxSymbolicExpressionTreeLengthAnalyzer(StorableConstructorFlag _) : base(_) { } 73 73 private MinAverageMaxSymbolicExpressionTreeLengthAnalyzer(MinAverageMaxSymbolicExpressionTreeLengthAnalyzer original, Cloner cloner) 74 74 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionSymbolFrequencyAnalyzer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 30 30 using HeuristicLab.Optimization; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 34 34 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 37 37 /// </summary> 38 38 [Item("SymbolicExpressionSymbolFrequencyAnalyzer", "An operator that tracks frequencies of symbols in symbolic expression trees.")] 39 [Storable Class]39 [StorableType("0A7CA6D1-813C-41F8-88BF-715621BA049F")] 40 40 public class SymbolicExpressionSymbolFrequencyAnalyzer : SingleSuccessorOperator, ISymbolicExpressionTreeAnalyzer { 41 41 private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree"; … … 69 69 70 70 [StorableConstructor] 71 protected SymbolicExpressionSymbolFrequencyAnalyzer( bool deserializing) : base(deserializing) { }71 protected SymbolicExpressionSymbolFrequencyAnalyzer(StorableConstructorFlag _) : base(_) { } 72 72 protected SymbolicExpressionSymbolFrequencyAnalyzer(SymbolicExpressionSymbolFrequencyAnalyzer original, Cloner cloner) : base(original, cloner) { } 73 73 public SymbolicExpressionSymbolFrequencyAnalyzer() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthAnalyzer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 33 33 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 36 36 /// </summary> 37 37 [Item("SymbolicExpressionTreeLengthAnalyzer", "An operator that tracks tree lengths of Symbolic Expression Trees")] 38 [Storable Class]38 [StorableType("8A9F09AC-40E4-4AA2-9270-9204C9460E66")] 39 39 public sealed class SymbolicExpressionTreeLengthAnalyzer : SingleSuccessorOperator, ISymbolicExpressionTreeAnalyzer { 40 40 private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree"; … … 92 92 93 93 [StorableConstructor] 94 private SymbolicExpressionTreeLengthAnalyzer( bool deserializing) : base(deserializing) { }94 private SymbolicExpressionTreeLengthAnalyzer(StorableConstructorFlag _) : base(_) { } 95 95 private SymbolicExpressionTreeLengthAnalyzer(SymbolicExpressionTreeLengthAnalyzer original, Cloner cloner) 96 96 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthCalculator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Operators; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 32 32 /// </summary> 33 33 [Item("SymbolicExpressionTreeLengthCalculator", "An operator that outputs the length of a symbolic expression tree.")] 34 [Storable Class]34 [StorableType("33E2EF4F-AA65-4E23-9E8C-0D0674A4186B")] 35 35 public sealed class SymbolicExpressionTreeLengthCalculator : SingleSuccessorOperator { 36 36 private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree"; … … 57 57 58 58 [StorableConstructor] 59 private SymbolicExpressionTreeLengthCalculator( bool deserializing) : base(deserializing) { }59 private SymbolicExpressionTreeLengthCalculator(StorableConstructorFlag _) : base(_) { } 60 60 private SymbolicExpressionTreeLengthCalculator(SymbolicExpressionTreeLengthCalculator original, Cloner cloner) : base(original, cloner) { } 61 61 public SymbolicExpressionTreeLengthCalculator() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentCreater.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 using HeuristicLab.Random; 31 31 … … 36 36 /// </summary> 37 37 [Item("ArgumentCreater", "Manipulates a symbolic expression by creating a new argument within one function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 106")] 38 [Storable Class]38 [StorableType("2AC1EE1A-B2B4-47E7-97AF-BFC9FB2D7BA2")] 39 39 public sealed class ArgumentCreater : SymbolicExpressionTreeArchitectureManipulator, ISymbolicExpressionTreeSizeConstraintOperator { 40 40 private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength"; … … 57 57 #endregion 58 58 [StorableConstructor] 59 private ArgumentCreater( bool deserializing) : base(deserializing) { }59 private ArgumentCreater(StorableConstructorFlag _) : base(_) { } 60 60 private ArgumentCreater(ArgumentCreater original, Cloner cloner) : base(original, cloner) { } 61 61 public ArgumentCreater() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDeleter.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 using HeuristicLab.Random; 28 28 … … 32 32 /// </summary> 33 33 [Item("ArgumentDeleter", "Manipulates a symbolic expression by deleting an argument from an existing function defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 112")] 34 [Storable Class]34 [StorableType("5A449735-B6B7-40AB-B1D6-A626FB768F71")] 35 35 public sealed class ArgumentDeleter : SymbolicExpressionTreeArchitectureManipulator { 36 36 [StorableConstructor] 37 private ArgumentDeleter( bool deserializing) : base(deserializing) { }37 private ArgumentDeleter(StorableConstructorFlag _) : base(_) { } 38 38 private ArgumentDeleter(ArgumentDeleter original, Cloner cloner) : base(original, cloner) { } 39 39 public ArgumentDeleter() : base() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDuplicater.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Core; 27 27 using HeuristicLab.Data; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 using HeuristicLab.Random; 30 30 … … 35 35 /// </summary> 36 36 [Item("ArgumentDuplicater", "Manipulates a symbolic expression by duplicating an existing argument node of a function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 94")] 37 [Storable Class]37 [StorableType("4F97833A-ECF6-436A-9634-1A9111302912")] 38 38 public sealed class ArgumentDuplicater : SymbolicExpressionTreeArchitectureManipulator { 39 39 [StorableConstructor] 40 private ArgumentDuplicater( bool deserializing) : base(deserializing) { }40 private ArgumentDuplicater(StorableConstructorFlag _) : base(_) { } 41 41 private ArgumentDuplicater(ArgumentDuplicater original, Cloner cloner) : base(original, cloner) { } 42 42 public ArgumentDuplicater() : base() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/GrammarModifier.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/MultiSymbolicExpressionTreeArchitectureManipulator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 30 30 using HeuristicLab.Optimization; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 using HeuristicLab.PluginInfrastructure; 34 34 35 35 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 36 36 [Item("MultiSymbolicExpressionTreeArchitectureManipulator", "Randomly selects and applies one of its architecture manipulators every time it is called.")] 37 [Storable Class]37 [StorableType("6D524953-37A3-4789-AB3A-6881E5289F49")] 38 38 public sealed class MultiSymbolicExpressionTreeArchitectureManipulator : StochasticMultiBranch<ISymbolicExpressionTreeManipulator>, 39 39 ISymbolicExpressionTreeArchitectureManipulator, … … 86 86 87 87 [StorableConstructor] 88 private MultiSymbolicExpressionTreeArchitectureManipulator( bool deserializing) : base(deserializing) { }88 private MultiSymbolicExpressionTreeArchitectureManipulator(StorableConstructorFlag _) : base(_) { } 89 89 private MultiSymbolicExpressionTreeArchitectureManipulator(MultiSymbolicExpressionTreeArchitectureManipulator original, Cloner cloner) : base(original, cloner) { } 90 90 public MultiSymbolicExpressionTreeArchitectureManipulator() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineCreater.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Data; 29 29 using HeuristicLab.Parameters; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 using HeuristicLab.Random; 32 32 … … 38 38 /// </summary> 39 39 [Item("SubroutineCreater", "Manipulates a symbolic expression by adding one new function-defining branch containing a proportion of a preexisting branch and by creating a reference to the new branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 97")] 40 [Storable Class]40 [StorableType("2F1F0953-534F-495C-B9C5-2C64D85E9AE2")] 41 41 public sealed class SubroutineCreater : SymbolicExpressionTreeArchitectureManipulator, ISymbolicExpressionTreeSizeConstraintOperator { 42 42 private const double ARGUMENT_CUTOFF_PROBABILITY = 0.05; … … 60 60 #endregion 61 61 [StorableConstructor] 62 private SubroutineCreater( bool deserializing) : base(deserializing) { }62 private SubroutineCreater(StorableConstructorFlag _) : base(_) { } 63 63 private SubroutineCreater(SubroutineCreater original, Cloner cloner) : base(original, cloner) { } 64 64 public SubroutineCreater() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDeleter.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Data; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 using HeuristicLab.Random; 29 29 … … 34 34 /// </summary> 35 35 [Item("SubroutineDeleter", "Manipulates a symbolic expression by deleting a preexisting function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 108")] 36 [Storable Class]36 [StorableType("A4AB4A79-F013-4DF4-847D-5F2C171859A7")] 37 37 public sealed class SubroutineDeleter : SymbolicExpressionTreeArchitectureManipulator { 38 38 [StorableConstructor] 39 private SubroutineDeleter( bool deserializing) : base(deserializing) { }39 private SubroutineDeleter(StorableConstructorFlag _) : base(_) { } 40 40 private SubroutineDeleter(SubroutineDeleter original, Cloner cloner) : base(original, cloner) { } 41 41 public SubroutineDeleter() : base() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDuplicater.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Core; 28 28 using HeuristicLab.Data; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 using HeuristicLab.Random; 31 31 … … 36 36 /// </summary> 37 37 [Item("SubroutineDuplicater", "Manipulates a symbolic expression by duplicating a preexisting function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 88")] 38 [Storable Class]38 [StorableType("FA58A28B-95B5-43BF-B94A-99FBFF4C9316")] 39 39 public sealed class SubroutineDuplicater : SymbolicExpressionTreeArchitectureManipulator { 40 40 [StorableConstructor] 41 private SubroutineDuplicater( bool deserializing) : base(deserializing) { }41 private SubroutineDuplicater(StorableConstructorFlag _) : base(_) { } 42 42 private SubroutineDuplicater(SubroutineDuplicater original, Cloner cloner) 43 43 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SymbolicExpressionTreeArchitectureManipulator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Data; 25 25 using HeuristicLab.Parameters; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 30 30 /// Base class for architecture altering operators for symbolic expression trees. 31 31 /// </summary> 32 [Storable Class]32 [StorableType("7D5ACE3E-DA4F-4E2D-9723-2596AB856B4D")] 33 33 public abstract class SymbolicExpressionTreeArchitectureManipulator : SymbolicExpressionTreeManipulator, ISymbolicExpressionTreeArchitectureManipulator { 34 34 private const string MaximumFunctionArgumentsParameterName = "MaximumFunctionArguments"; … … 54 54 #endregion 55 55 [StorableConstructor] 56 protected SymbolicExpressionTreeArchitectureManipulator( bool deserializing) : base(deserializing) { }56 protected SymbolicExpressionTreeArchitectureManipulator(StorableConstructorFlag _) : base(_) { } 57 57 protected SymbolicExpressionTreeArchitectureManipulator(SymbolicExpressionTreeArchitectureManipulator original, Cloner cloner) : base(original, cloner) { } 58 58 public SymbolicExpressionTreeArchitectureManipulator() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/Instruction.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 public byte opCode; 30 30 // number of arguments of the current instruction 31 public bytenArguments;31 public ushort nArguments; 32 32 // an optional object value (addresses for calls, argument index for arguments) 33 33 public object data; -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/LinearInstruction.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/SymbolicExpressionTreeCompiler.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 63 63 Instruction instr = new Instruction(); 64 64 int subtreesCount = node.SubtreeCount; 65 if (subtreesCount > 255) throw new ArgumentException("Number of subtrees is too big (>255)");66 instr.nArguments = ( byte)subtreesCount;65 if (subtreesCount > ushort.MaxValue) throw new ArgumentException("Number of subtrees is too big (> 65.535)"); 66 instr.nArguments = (ushort)subtreesCount; 67 67 instr.opCode = opCodeMapper(node); 68 68 if (node.Symbol is Argument) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/SymbolicExpressionTreeLinearCompiler.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 var root = tree.Root.GetSubtree(0).GetSubtree(0); 28 28 var code = new LinearInstruction[root.GetLength()]; 29 code[0] = new LinearInstruction { dynamicNode = root, nArguments = (byte)root.SubtreeCount, opCode = opCodeMapper(root) }; 29 if (root.SubtreeCount > ushort.MaxValue) throw new ArgumentException("Number of subtrees is too big (>65.535)"); 30 code[0] = new LinearInstruction { dynamicNode = root, nArguments = (ushort)root.SubtreeCount, opCode = opCodeMapper(root) }; 30 31 int c = 1, i = 0; 31 32 foreach (var node in root.IterateNodesBreadth()) { 32 33 for (int j = 0; j < node.SubtreeCount; ++j) { 33 34 var s = node.GetSubtree(j); 34 code[c + j] = new LinearInstruction { dynamicNode = s, nArguments = (byte)s.SubtreeCount, opCode = opCodeMapper(s) }; 35 if (s.SubtreeCount > ushort.MaxValue) throw new ArgumentException("Number of subtrees is too big (>65.535)"); 36 code[c + j] = new LinearInstruction { dynamicNode = s, nArguments = (ushort)s.SubtreeCount, opCode = opCodeMapper(s) }; 35 37 } 36 38 code[i].childIndex = c; -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/FullTreeCreator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 using HeuristicLab.PluginInfrastructure; 28 28 29 29 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 30 30 [NonDiscoverableType] 31 [Storable Class]31 [StorableType("1A36CB91-B3AD-4D3D-B44F-2CA5508C55ED")] 32 32 [Item("FullTreeCreator", "An operator that creates new symbolic expression trees using the 'Full' method")] 33 33 public class FullTreeCreator : SymbolicExpressionTreeCreator, … … 36 36 37 37 [StorableConstructor] 38 protected FullTreeCreator( bool deserializing) : base(deserializing) { }38 protected FullTreeCreator(StorableConstructorFlag _) : base(_) { } 39 39 protected FullTreeCreator(FullTreeCreator original, Cloner cloner) : base(original, cloner) { } 40 40 -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/GrowTreeCreator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 using HeuristicLab.PluginInfrastructure; 28 28 29 29 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 30 30 [NonDiscoverableType] 31 [Storable Class]31 [StorableType("ECE25817-D6B8-45CA-9B03-F8B2940FF622")] 32 32 [Item("GrowTreeCreator", "An operator that creates new symbolic expression trees using the 'Grow' method")] 33 33 public class GrowTreeCreator : SymbolicExpressionTreeCreator { 34 34 [StorableConstructor] 35 protected GrowTreeCreator( bool deserializing) : base(deserializing) { }35 protected GrowTreeCreator(StorableConstructorFlag _) : base(_) { } 36 36 protected GrowTreeCreator(GrowTreeCreator original, Cloner cloner) : base(original, cloner) { } 37 37 -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 using HeuristicLab.PluginInfrastructure; 29 29 30 30 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 31 31 [NonDiscoverableType] 32 [Storable Class]32 [StorableType("6B26A8D9-60CC-4723-94ED-D185BB716AD1")] 33 33 [Item("ProbabilisticTreeCreator", "An operator that creates new symbolic expression trees with uniformly distributed length")] 34 34 public class ProbabilisticTreeCreator : SymbolicExpressionTreeCreator, … … 37 37 38 38 [StorableConstructor] 39 protected ProbabilisticTreeCreator( bool deserializing) : base(deserializing) { }39 protected ProbabilisticTreeCreator(StorableConstructorFlag _) : base(_) { } 40 40 protected ProbabilisticTreeCreator(ProbabilisticTreeCreator original, Cloner cloner) : base(original, cloner) { } 41 41 public ProbabilisticTreeCreator() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/RampedHalfAndHalfTreeCreator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 using HeuristicLab.PluginInfrastructure; 26 26 27 27 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 28 28 [NonDiscoverableType] 29 [Storable Class]29 [StorableType("0E43AC76-6CD1-4371-90A6-05F7C5B05EC8")] 30 30 [Item("RampedHalfAndHalfTreeCreator", "An operator that creates new symbolic expression trees in an alternate way: half the trees are created usign the 'Grow' method while the other half are created using the 'Full' method")] 31 31 public class RampedHalfAndHalfTreeCreator : SymbolicExpressionTreeCreator { 32 32 [StorableConstructor] 33 protected RampedHalfAndHalfTreeCreator( bool deserializing) : base(deserializing) { }33 protected RampedHalfAndHalfTreeCreator(StorableConstructorFlag _) : base(_) { } 34 34 protected RampedHalfAndHalfTreeCreator(RampedHalfAndHalfTreeCreator original, Cloner cloner) : base(original, cloner) { } 35 35 -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/SymbolicExpressionTreeCreator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Data; 25 25 using HeuristicLab.Parameters; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 31 31 /// </summary> 32 32 [Item("SymbolicExpressionTreeCreator", "A base class for operators creating symbolic expression trees.")] 33 [Storable Class]33 [StorableType("88CC0F00-5674-4598-A3C4-756B3B7E80CB")] 34 34 public abstract class SymbolicExpressionTreeCreator : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeCreator { 35 35 private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength"; … … 56 56 57 57 [StorableConstructor] 58 protected SymbolicExpressionTreeCreator( bool deserializing) : base(deserializing) { }58 protected SymbolicExpressionTreeCreator(StorableConstructorFlag _) : base(_) { } 59 59 protected SymbolicExpressionTreeCreator(SymbolicExpressionTreeCreator original, Cloner cloner) : base(original, cloner) { } 60 60 protected SymbolicExpressionTreeCreator() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 using HeuristicLab.Random; 31 31 … … 38 38 /// </summary> 39 39 [Item("SubtreeSwappingCrossover", "An operator which performs subtree swapping crossover.")] 40 [Storable Class]40 [StorableType("2A2552C0-11C8-4F60-90B2-5FDDD3AB2444")] 41 41 public class SubtreeCrossover : SymbolicExpressionTreeCrossover, ISymbolicExpressionTreeSizeConstraintOperator { 42 42 private const string InternalCrossoverPointProbabilityParameterName = "InternalCrossoverPointProbability"; … … 67 67 #endregion 68 68 [StorableConstructor] 69 protected SubtreeCrossover( bool deserializing) : base(deserializing) { }69 protected SubtreeCrossover(StorableConstructorFlag _) : base(_) { } 70 70 protected SubtreeCrossover(SubtreeCrossover original, Cloner cloner) : base(original, cloner) { } 71 71 public SubtreeCrossover() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SymbolicExpressionTreeCrossover.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Parameters; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 31 31 /// </summary> 32 32 [Item("SymbolicExpressionTreeCrossover", "A base class for operators that perform a crossover of symbolic expression trees.")] 33 [Storable Class]33 [StorableType("AB6004AE-B6ED-41D7-824E-87ECDA5B0AAF")] 34 34 public abstract class SymbolicExpressionTreeCrossover : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeCrossover { 35 35 private const string ParentsParameterName = "Parents"; … … 49 49 #endregion 50 50 [StorableConstructor] 51 protected SymbolicExpressionTreeCrossover( bool deserializing) : base(deserializing) { }51 protected SymbolicExpressionTreeCrossover(StorableConstructorFlag _) : base(_) { } 52 52 protected SymbolicExpressionTreeCrossover(SymbolicExpressionTreeCrossover original, Cloner cloner) : base(original, cloner) { } 53 53 protected SymbolicExpressionTreeCrossover() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/CutPoint.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/EnumerableExtensions.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeGraphvizFormatter.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeHierarchicalFormatter.cs
r16692 r16723 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 29 30 [Item("Hierarchical Formatter", "Formatter for symbolic expression trees that uses special characters for drawing a tree in text-mode.")] 31 [StorableType("0a9ad135-ced1-4c3b-94ff-b1fb41193515")] 30 32 public sealed class SymbolicExpressionTreeHierarchicalFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter { 31 private SymbolicExpressionTreeHierarchicalFormatter(SymbolicExpressionTreeHierarchicalFormatter original, Cloner cloner) 32 : base(original, cloner) { 33 } 33 [StorableConstructor] 34 private SymbolicExpressionTreeHierarchicalFormatter(StorableConstructorFlag _) : base(_) { } 35 36 private SymbolicExpressionTreeHierarchicalFormatter(SymbolicExpressionTreeHierarchicalFormatter original, Cloner cloner) : base(original, cloner) { } 34 37 public override IDeepCloneable Clone(Cloner cloner) { 35 38 return new SymbolicExpressionTreeHierarchicalFormatter(this, cloner); -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeStringFormatter.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Common; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 29 29 30 30 [Item("Default String Formatter", "The default string formatter for symbolic expression trees.")] 31 [Storable Class]31 [StorableType("BF3EBDE5-D37A-4F55-AC43-C146AE8FFF24")] 32 32 public class SymbolicExpressionTreeStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter { 33 33 … … 35 35 36 36 [StorableConstructor] 37 protected SymbolicExpressionTreeStringFormatter( bool deserializing) : base(deserializing) { }37 protected SymbolicExpressionTreeStringFormatter(StorableConstructorFlag _) : base(_) { } 38 38 protected SymbolicExpressionTreeStringFormatter(SymbolicExpressionTreeStringFormatter original, Cloner cloner) 39 39 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/EmptySymbolicExpressionTreeGrammar.cs
r16692 r16723 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Common; 28 28 using HeuristicLab.Core; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 32 32 33 [Storable Class]33 [StorableType("59B5B5B9-0F49-4994-B221-856AA43C28B4")] 34 34 internal sealed class EmptySymbolicExpressionTreeGrammar : NamedItem, ISymbolicExpressionTreeGrammar { 35 35 [Storable] … … 37 37 38 38 [StorableConstructor] 39 private EmptySymbolicExpressionTreeGrammar( bool deserializing) : base(deserializing) { }39 private EmptySymbolicExpressionTreeGrammar(StorableConstructorFlag _) : base(_) { } 40 40 internal EmptySymbolicExpressionTreeGrammar(ISymbolicExpressionGrammar grammar) 41 41 : base() { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/GrammarUtils.cs
r16692 r16723 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SimpleSymbolicExpressionGrammar.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System.Collections.Generic; 23 23 using HeuristicLab.Common; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 26 26 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 27 [Storable Class]27 [StorableType("70D190B2-22F4-41E5-9938-EFD1B14ECF43")] 28 28 public sealed class SimpleSymbolicExpressionGrammar : SymbolicExpressionGrammar { 29 29 [StorableConstructor] 30 private SimpleSymbolicExpressionGrammar( bool deserializing) : base(deserializing) { }30 private SimpleSymbolicExpressionGrammar(StorableConstructorFlag _) : base(_) { } 31 31 private SimpleSymbolicExpressionGrammar(SimpleSymbolicExpressionGrammar original, Cloner cloner) : base(original, cloner) { } 32 32 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammar.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Common; 27 27 using HeuristicLab.Core; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 31 [Storable Class]31 [StorableType("925BDEE9-0D46-48DB-BA1B-DCE82C0480B3")] 32 32 public abstract class SymbolicExpressionGrammar : SymbolicExpressionGrammarBase, ISymbolicExpressionGrammar { 33 33 #region fields & properties … … 121 121 122 122 [StorableConstructor] 123 protected SymbolicExpressionGrammar(bool deserializing) 124 : base(deserializing) { 123 protected SymbolicExpressionGrammar(StorableConstructorFlag _) : base(_) { 125 124 emptyGrammar = new EmptySymbolicExpressionTreeGrammar(this); 126 125 } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammarBase.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 34 34 /// in the sub-trees of a symbol (can be specified for each sub-tree index separately). 35 35 /// </summary> 36 [Storable Class]36 [StorableType("E76C087C-4E10-488A-86D0-295A4265DA53")] 37 37 public abstract class SymbolicExpressionGrammarBase : NamedItem, ISymbolicExpressionGrammarBase { 38 38 … … 80 80 81 81 [StorableConstructor] 82 protected SymbolicExpressionGrammarBase(bool deserializing) 83 : base(deserializing) { 82 protected SymbolicExpressionGrammarBase(StorableConstructorFlag _) : base(_) { 84 83 85 84 symbols = new Dictionary<string, ISymbol>(); -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionTreeGrammar.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Collections.Generic; 24 24 using HeuristicLab.Common; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 28 [Storable Class]28 [StorableType("ADB1DF1C-BE39-49F7-BADD-978F495EEA4D")] 29 29 internal sealed class SymbolicExpressionTreeGrammar : SymbolicExpressionGrammarBase, ISymbolicExpressionTreeGrammar { 30 30 [StorableConstructor] 31 private SymbolicExpressionTreeGrammar( bool deserializing) : base(deserializing) { }31 private SymbolicExpressionTreeGrammar(StorableConstructorFlag _) : base(_) { } 32 32 private SymbolicExpressionTreeGrammar(SymbolicExpressionTreeGrammar original, Cloner cloner) 33 33 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj
r16692 r16723 11 11 <RootNamespace>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <TargetFrameworkProfile> 15 15 </TargetFrameworkProfile> … … 293 293 </BootstrapperPackage> 294 294 </ItemGroup> 295 <ItemGroup> 296 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 297 <SpecificVersion>False</SpecificVersion> 298 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 299 <Private>False</Private> 300 </Reference> 301 </ItemGroup> 295 302 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 296 303 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/IReadOnlySymbol.cs
r16692 r16723 1 #region License Information 1 using HEAL.Attic; 2 #region License Information 2 3 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 5 * 5 6 * This file is part of HeuristicLab. … … 20 21 #endregion 21 22 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 23 [StorableType("a5fbffbb-dd8d-4cdb-bb4a-d617370a59f3")] 22 24 public interface IReadOnlySymbol : ISymbol { 23 25 } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbol.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Collections.Generic; 24 24 using HeuristicLab.Core; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 28 [StorableType("25137f88-66b9-48d7-a2bd-60190082e044")] 27 29 public interface ISymbol : INamedItem { 28 30 ISymbolicExpressionTreeNode CreateTreeNode(); -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionGrammar.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System; 24 24 using HeuristicLab.Core; 25 using HEAL.Attic; 26 25 27 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 28 [StorableType("1f6afcbe-b309-44e2-8d35-2d33eaeb9649")] 26 29 public interface ISymbolicExpressionGrammar : ISymbolicExpressionGrammarBase, IStatefulItem { 27 30 ISymbol ProgramRootSymbol { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionGrammarBase.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Collections.Generic; 24 24 using HeuristicLab.Core; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 28 [StorableType("119f5e94-bc7d-42fc-a48b-ac0230115ef2")] 27 29 public interface ISymbolicExpressionGrammarBase : INamedItem { 28 30 IEnumerable<ISymbol> Symbols { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTree.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Optimization; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 29 [StorableType("433dd098-7813-4226-aa76-a41d63c25f81")] 28 30 public interface ISymbolicExpressionTree : IItem, ISolution { 29 31 ISymbolicExpressionTreeNode Root { get; set; } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeGrammar.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using System.Collections.Generic; 23 using HEAL.Attic; 24 23 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [StorableType("75a6319f-4bfb-4aa5-823b-f340f9a1e753")] 24 27 public interface ISymbolicExpressionTreeGrammar : ISymbolicExpressionGrammarBase { 25 28 IEnumerable<ISymbol> ModifyableSymbols { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNode.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using HEAL.Attic; 26 25 27 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 28 [StorableType("1a0ee1b9-590f-4763-890b-fba196a8f3fd")] 26 29 public interface ISymbolicExpressionTreeNode : IDeepCloneable { 27 30 ISymbolicExpressionTreeGrammar Grammar { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNodeComparer.cs
r10562 r16723 1 1 using System.Collections.Generic; 2 using HEAL.Attic; 2 3 3 4 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 5 [StorableType("7d8c5996-ca0b-4168-bc29-090cd196f83e")] 4 6 public interface ISymbolicExpressionTreeNodeComparer : IComparer<ISymbolicExpressionTreeNode> { } 5 7 } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNodeSimilarityComparer.cs
r10562 r16723 1 1 using System.Collections.Generic; 2 2 using HeuristicLab.Core; 3 using HEAL.Attic; 3 4 4 5 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 6 [StorableType("c4de8ab2-616d-4c73-9f9c-59545ac38199")] 5 7 public interface ISymbolicExpressionTreeNodeSimilarityComparer : IEqualityComparer<ISymbolicExpressionTreeNode>, IItem { 6 8 bool MatchConstantValues { get; set; } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeStringFormatter.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [StorableType("e32d9fae-2b90-40a1-9ea3-dc81853d0633")] 25 27 public interface ISymbolicExpressionTreeStringFormatter : INamedItem { 26 28 string Format(ISymbolicExpressionTree symbolicExpressionTree); -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeAnalyzer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Optimization; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 27 [StorableType("88e02362-f709-45bc-9286-9afb5e7a097e")] 26 28 /// <summary> 27 29 /// Interface for analyzers that can be applied to symbolic expression trees. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeArchitectureAlteringOperator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Data; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 27 [StorableType("948aed2f-ad34-44aa-a6a6-0c14fbfafe3e")] 26 28 public interface ISymbolicExpressionTreeArchitectureAlteringOperator : ISymbolicExpressionTreeOperator { 27 29 IValueLookupParameter<IntValue> MaximumFunctionDefinitionsParameter { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeArchitectureManipulator.cs
r16692 r16723 1 #region License Information 1 using HEAL.Attic; 2 #region License Information 2 3 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 5 * 5 6 * This file is part of HeuristicLab. … … 20 21 #endregion 21 22 22 using HeuristicLab.Core;23 using HeuristicLab.Data;24 23 25 24 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 25 [StorableType("237e7ea7-1c57-4a3a-84f5-1193a0f67a16")] 26 26 /// <summary> 27 27 /// Interface for operators that manipulate symbolic expression trees. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeCreator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Optimization; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 27 [StorableType("acd473fc-5720-430e-b4dc-4350506ff14b")] 26 28 /// <summary> 27 29 /// Interface for operators that create symbolic expression trees. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeCrossover.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Optimization; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 27 [StorableType("bd6d2c3c-a6dd-4e73-abd5-dc6c204e2034")] 26 28 /// <summary> 27 29 /// Interface for crossover operators that can be applied to symbolic expression trees. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeGrammarBasedOperator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [StorableType("e480297b-8cfc-4e43-a338-1106677b9c71")] 25 27 /// <summary> 26 28 /// Interface for operators that can be applied to symbolic expression trees. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeManipulator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 20 20 #endregion 21 21 22 using HeuristicLab.Core;23 22 using HeuristicLab.Optimization; 23 using HEAL.Attic; 24 24 25 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [StorableType("35d40821-ee75-4212-baf9-4138db862b77")] 26 27 /// <summary> 27 28 /// Interface for operators that manipulate symbolic expression trees. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeOperator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [StorableType("83f6a886-9cf0-4657-8c19-76ed05eb0552")] 25 27 /// <summary> 26 28 /// Interface for operators that can be applied to symbolic expression trees. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeSizeConstraintOperator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Data; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 27 [StorableType("b69a9830-2313-4a9d-9fa0-4650a3bdfdd2")] 26 28 public interface ISymbolicExpressionTreeSizeConstraintOperator : ISymbolicExpressionTreeOperator { 27 29 IValueLookupParameter<IntValue> MaximumSymbolicExpressionTreeDepthParameter { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ChangeNodeTypeManipulation.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 29 [Storable Class]29 [StorableType("92D37E9F-8726-4524-AF8F-F3787641F7B9")] 30 30 [Item("ChangeNodeTypeManipulation", "Selects a random tree node and changes the symbol.")] 31 31 public sealed class ChangeNodeTypeManipulation : SymbolicExpressionTreeManipulator { … … 33 33 34 34 [StorableConstructor] 35 private ChangeNodeTypeManipulation( bool deserializing) : base(deserializing) { }35 private ChangeNodeTypeManipulation(StorableConstructorFlag _) : base(_) { } 36 36 private ChangeNodeTypeManipulation(ChangeNodeTypeManipulation original, Cloner cloner) : base(original, cloner) { } 37 37 public ChangeNodeTypeManipulation() : base() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/FullTreeShaker.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Data; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Parameters; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 29 [Storable Class]29 [StorableType("C8864746-308A-49F0-B76F-92D2C7E33574")] 30 30 [Item("FullTreeShaker", "Manipulates all nodes that have local parameters.")] 31 31 public sealed class FullTreeShaker : SymbolicExpressionTreeManipulator { … … 43 43 #endregion 44 44 [StorableConstructor] 45 private FullTreeShaker( bool deserializing) : base(deserializing) { }45 private FullTreeShaker(StorableConstructorFlag _) : base(_) { } 46 46 private FullTreeShaker(FullTreeShaker original, Cloner cloner) : base(original, cloner) { } 47 47 public FullTreeShaker() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/MultiSymbolicExpressionTreeManipulator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 30 30 using HeuristicLab.Optimization; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 using HeuristicLab.PluginInfrastructure; 34 34 35 35 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 36 36 [Item("MultiSymbolicExpressionTreeManipulator", "Randomly selects and applies one of its manipulators every time it is called.")] 37 [Storable Class]37 [StorableType("0A0ED8D8-69D4-4F58-A4FD-6D97F27B4009")] 38 38 public sealed class MultiSymbolicExpressionTreeManipulator : StochasticMultiBranch<ISymbolicExpressionTreeManipulator>, 39 39 ISymbolicExpressionTreeManipulator, … … 64 64 65 65 [StorableConstructor] 66 private MultiSymbolicExpressionTreeManipulator( bool deserializing) : base(deserializing) { }66 private MultiSymbolicExpressionTreeManipulator(StorableConstructorFlag _) : base(_) { } 67 67 private MultiSymbolicExpressionTreeManipulator(MultiSymbolicExpressionTreeManipulator original, Cloner cloner) : base(original, cloner) { } 68 68 public MultiSymbolicExpressionTreeManipulator() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/OnePointShaker.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Data; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 using HeuristicLab.Random; 29 29 30 30 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 31 [Storable Class]31 [StorableType("959330FD-85FA-4615-A047-3A1493573A42")] 32 32 [Item("OnePointShaker", "Selects a random node with local parameters and manipulates the selected node.")] 33 33 public sealed class OnePointShaker : SymbolicExpressionTreeManipulator { … … 45 45 #endregion 46 46 [StorableConstructor] 47 private OnePointShaker( bool deserializing) : base(deserializing) { }47 private OnePointShaker(StorableConstructorFlag _) : base(_) { } 48 48 private OnePointShaker(OnePointShaker original, Cloner cloner) : base(original, cloner) { } 49 49 public OnePointShaker() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/RemoveBranchManipulation.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 using HeuristicLab.Random; 30 30 31 31 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 32 [Storable Class]32 [StorableType("639F837E-3AF9-4783-9AC2-0A4DC8991FED")] 33 33 [Item("RemoveBranchManipulation", "Removes a random sub-tree of the input tree and fixes the tree by generating random subtrees if necessary..")] 34 34 public sealed class RemoveBranchManipulation : SymbolicExpressionTreeManipulator, ISymbolicExpressionTreeSizeConstraintOperator { … … 54 54 55 55 [StorableConstructor] 56 private RemoveBranchManipulation( bool deserializing) : base(deserializing) { }56 private RemoveBranchManipulation(StorableConstructorFlag _) : base(_) { } 57 57 private RemoveBranchManipulation(RemoveBranchManipulation original, Cloner cloner) : base(original, cloner) { } 58 58 public RemoveBranchManipulation() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ReplaceBranchManipulation.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 31 [Storable Class]31 [StorableType("92286134-0520-4A1E-B8EE-01AFAD55C3AE")] 32 32 [Item("ReplaceBranchManipulation", "Selects a branch of the tree randomly and replaces it with a newly initialized branch (using PTC2).")] 33 33 public sealed class ReplaceBranchManipulation : SymbolicExpressionTreeManipulator, ISymbolicExpressionTreeSizeConstraintOperator { … … 53 53 54 54 [StorableConstructor] 55 private ReplaceBranchManipulation( bool deserializing) : base(deserializing) { }55 private ReplaceBranchManipulation(StorableConstructorFlag _) : base(_) { } 56 56 private ReplaceBranchManipulation(ReplaceBranchManipulation original, Cloner cloner) : base(original, cloner) { } 57 57 public ReplaceBranchManipulation() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/SymbolicExpressionTreeManipulator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using HeuristicLab.Parameters; 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 24 using HEAL.Attic; 26 25 27 26 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 30 29 /// </summary> 31 30 [Item("SymbolicExpressionTreeManipulator", "A base class for operators that manipulate symbolic expression trees.")] 32 [Storable Class]31 [StorableType("9391A979-616B-4808-80E7-99D8802599AF")] 33 32 public abstract class SymbolicExpressionTreeManipulator : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeManipulator { 34 33 [StorableConstructor] 35 protected SymbolicExpressionTreeManipulator( bool deserializing) : base(deserializing) { }34 protected SymbolicExpressionTreeManipulator(StorableConstructorFlag _) : base(_) { } 36 35 protected SymbolicExpressionTreeManipulator(SymbolicExpressionTreeManipulator original, Cloner cloner) : base(original, cloner) { } 37 36 public SymbolicExpressionTreeManipulator() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Plugin.cs.frame
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 37 37 [PluginDependency("HeuristicLab.Optimization", "3.3")] 38 38 [PluginDependency("HeuristicLab.Parameters", "3.3")] 39 [PluginDependency("HeuristicLab. Persistence", "3.3")]39 [PluginDependency("HeuristicLab.Attic", "1.0")] 40 40 [PluginDependency("HeuristicLab.Random", "3.3")] 41 41 public class HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin : PluginBase { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Properties/AssemblyInfo.cs.frame
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTree.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Common; 27 27 using HeuristicLab.Core; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 31 [Storable Class]31 [StorableType("E98BB36B-FBB5-4A6C-A2E5-D47E0BD0687B")] 32 32 [Item("SymbolicExpressionTree", "Represents a symbolic expression tree.")] 33 33 public class SymbolicExpressionTree : Item, ISymbolicExpressionTree { … … 65 65 66 66 [StorableConstructor] 67 protected SymbolicExpressionTree( bool deserializing) : base(deserializing) { }67 protected SymbolicExpressionTree(StorableConstructorFlag _) : base(_) { } 68 68 protected SymbolicExpressionTree(SymbolicExpressionTree original, Cloner cloner) 69 69 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeEncoding.cs
r16692 r16723 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. … … 30 30 using HeuristicLab.Optimization; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 using HeuristicLab.PluginInfrastructure; 34 34 35 35 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 36 36 [Item("SymbolicExpressionTreeEncoding", "Describes a symbolic expression tree encoding.")] 37 [Storable Class]37 [StorableType("3FDE530B-771F-4280-921F-20DA50A139BA")] 38 38 public sealed class SymbolicExpressionTreeEncoding : Encoding<ISymbolicExpressionTree> { 39 39 #region Encoding Parameters … … 158 158 159 159 [StorableConstructor] 160 private SymbolicExpressionTreeEncoding( bool deserializing) : base(deserializing) { }160 private SymbolicExpressionTreeEncoding(StorableConstructorFlag _) : base(_) { } 161 161 public SymbolicExpressionTreeEncoding() : this(new SimpleSymbolicExpressionGrammar()) { } 162 162 public SymbolicExpressionTreeEncoding(ISymbolicExpressionGrammar grammar) : this("SymbolicExpressionTree", grammar, 50, 50) { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 29 [Storable Class]29 [StorableType("E3549A82-D4C5-4AEC-A44C-D3205A618A21")] 30 30 public class SymbolicExpressionTreeNode : DeepCloneable, ISymbolicExpressionTreeNode { 31 31 [Storable] … … 51 51 52 52 [StorableConstructor] 53 protected SymbolicExpressionTreeNode( bool deserializing) { }53 protected SymbolicExpressionTreeNode(StorableConstructorFlag _) { } 54 54 protected SymbolicExpressionTreeNode(SymbolicExpressionTreeNode original, Cloner cloner) 55 55 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeOperator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Optimization; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { … … 32 32 /// </summary> 33 33 [Item("SymbolicExpressionTreeOperator", "A base class for operators for symbolic expression trees.")] 34 [Storable Class]34 [StorableType("09F2EC44-6249-4DDE-BA60-A4A3ACDF861B")] 35 35 public abstract class SymbolicExpressionTreeOperator : InstrumentedOperator, IStochasticOperator, ISymbolicExpressionTreeOperator { 36 36 private const string RandomParameterName = "Random"; … … 51 51 52 52 [StorableConstructor] 53 protected SymbolicExpressionTreeOperator( bool deserializing) : base(deserializing) { }53 protected SymbolicExpressionTreeOperator(StorableConstructorFlag _) : base(_) { } 54 54 protected SymbolicExpressionTreeOperator(SymbolicExpressionTreeOperator original, Cloner cloner) : base(original, cloner) { } 55 55 protected SymbolicExpressionTreeOperator() -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs
r16692 r16723 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Data; 29 29 using HeuristicLab.Optimization; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 33 [Storable Class]33 [StorableType("A1B9F4C8-5E29-493C-A483-2AC68453BC63")] 34 34 public abstract class SymbolicExpressionTreeProblem : SingleObjectiveProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> { 35 35 36 36 // persistence 37 37 [StorableConstructor] 38 protected SymbolicExpressionTreeProblem( bool deserializing) : base(deserializing) { }38 protected SymbolicExpressionTreeProblem(StorableConstructorFlag _) : base(_) { } 39 39 [StorableHook(HookType.AfterDeserialization)] 40 40 private void AfterDeserialization() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeTerminalNode.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using System.Linq; 25 25 using HeuristicLab.Common; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 29 [Storable Class]29 [StorableType("B930B7DB-7264-432D-BA59-F21432DEC88B")] 30 30 public abstract class SymbolicExpressionTreeTerminalNode : SymbolicExpressionTreeNode { 31 31 public override IEnumerable<ISymbolicExpressionTreeNode> Subtrees { … … 34 34 35 35 [StorableConstructor] 36 protected SymbolicExpressionTreeTerminalNode( bool deserializing) : base(deserializing) { }36 protected SymbolicExpressionTreeTerminalNode(StorableConstructorFlag _) : base(_) { } 37 37 protected SymbolicExpressionTreeTerminalNode(SymbolicExpressionTreeTerminalNode original, Cloner cloner) : base(original, cloner) { } 38 38 protected SymbolicExpressionTreeTerminalNode() : base() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeTopLevelNode.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using HeuristicLab.Common; 23 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;23 using HEAL.Attic; 24 24 25 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [Storable Class]26 [StorableType("3888AE52-0D58-4FC4-BDAF-6112BF6AFD8A")] 27 27 public class SymbolicExpressionTreeTopLevelNode : SymbolicExpressionTreeNode { 28 28 [Storable] … … 36 36 37 37 [StorableConstructor] 38 protected SymbolicExpressionTreeTopLevelNode( bool deserializing) : base(deserializing) { }38 protected SymbolicExpressionTreeTopLevelNode(StorableConstructorFlag _) : base(_) { } 39 39 protected SymbolicExpressionTreeTopLevelNode(SymbolicExpressionTreeTopLevelNode original, Cloner cloner) 40 40 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Argument.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 26 /// <summary> 27 27 /// Symbol for function arguments 28 28 /// </summary> 29 [Storable Class]29 [StorableType("B0D02BED-6A67-469E-9A7C-8651C3805329")] 30 30 [Item(Argument.ArgumentName, Argument.ArgumentDescription)] 31 31 public sealed class Argument : Symbol, IReadOnlySymbol { … … 49 49 50 50 [StorableConstructor] 51 private Argument( bool deserializing) : base(deserializing) { }51 private Argument(StorableConstructorFlag _) : base(_) { } 52 52 private Argument(Argument original, Cloner cloner) 53 53 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/ArgumentTreeNode.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System; 23 23 using HeuristicLab.Common; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [Storable Class]26 [StorableType("70BA57A9-F8AB-428B-BBB9-113FA5137774")] 27 27 public sealed class ArgumentTreeNode : SymbolicExpressionTreeTerminalNode { 28 28 internal new Argument Symbol { … … 36 36 37 37 [StorableConstructor] 38 private ArgumentTreeNode( bool deserializing) : base(deserializing) { }38 private ArgumentTreeNode(StorableConstructorFlag _) : base(_) { } 39 39 private ArgumentTreeNode(ArgumentTreeNode original, Cloner cloner) : base(original, cloner) { } 40 40 public ArgumentTreeNode(Argument argSymbol) : base(argSymbol) { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Defun.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 26 /// <summary> 27 27 /// Symbol for function defining branches 28 28 /// </summary> 29 [Storable Class]29 [StorableType("1854AECB-02AB-444F-959C-094548ED7932")] 30 30 [Item(Defun.DefunName, Defun.DefunDescription)] 31 31 public sealed class Defun : Symbol, IReadOnlySymbol { … … 43 43 44 44 [StorableConstructor] 45 private Defun( bool deserializing) : base(deserializing) { }45 private Defun(StorableConstructorFlag _) : base(_) { } 46 46 private Defun(Defun original, Cloner cloner) : base(original, cloner) { } 47 47 public Defun() : base(Defun.DefunName, Defun.DefunDescription) { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/DefunTreeNode.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using HeuristicLab.Common; 23 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;23 using HEAL.Attic; 24 24 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 25 [Storable Class]25 [StorableType("0DEAAC29-2BC7-4018-8CAA-ACF77F8C89C8")] 26 26 public sealed class DefunTreeNode : SymbolicExpressionTreeTopLevelNode { 27 27 private int numberOfArguments; … … 39 39 40 40 [StorableConstructor] 41 private DefunTreeNode( bool deserializing) : base(deserializing) { }41 private DefunTreeNode(StorableConstructorFlag _) : base(_) { } 42 42 private DefunTreeNode(DefunTreeNode original, Cloner cloner) 43 43 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/GroupSymbol.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Collections; 25 25 using HeuristicLab.Common; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 29 [Storable Class]29 [StorableType("B9D90B52-04E2-4B18-A293-160061DAD57F")] 30 30 public sealed class GroupSymbol : Symbol { 31 31 private const int minimumArity = 0; … … 50 50 51 51 [StorableConstructor] 52 private GroupSymbol( bool deserializing) : base(deserializing) { }52 private GroupSymbol(StorableConstructorFlag _) : base(_) { } 53 53 private GroupSymbol(GroupSymbol original, Cloner cloner) 54 54 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunction.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 26 /// <summary> 27 27 /// Symbol for invoking automatically defined functions 28 28 /// </summary> 29 [Storable Class]29 [StorableType("F98DAAD3-1FCB-490B-9D28-160ED9718441")] 30 30 [Item(InvokeFunction.InvokeFunctionName, InvokeFunction.InvokeFunctionDescription)] 31 31 public sealed class InvokeFunction : Symbol, IReadOnlySymbol { … … 49 49 50 50 [StorableConstructor] 51 private InvokeFunction( bool deserializing) : base(deserializing) { }51 private InvokeFunction(StorableConstructorFlag _) : base(_) { } 52 52 private InvokeFunction(InvokeFunction original, Cloner cloner) 53 53 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunctionTreeNode.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System; 23 23 using HeuristicLab.Common; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [Storable Class]26 [StorableType("E745D56A-5320-4A2A-98EF-2A2903B6ED7A")] 27 27 public sealed class InvokeFunctionTreeNode : SymbolicExpressionTreeNode { 28 28 public new InvokeFunction Symbol { … … 36 36 37 37 [StorableConstructor] 38 private InvokeFunctionTreeNode( bool deserializing) : base(deserializing) { }38 private InvokeFunctionTreeNode(StorableConstructorFlag _) : base(_) { } 39 39 private InvokeFunctionTreeNode(InvokeFunctionTreeNode original, Cloner cloner) : base(original, cloner) { } 40 40 public InvokeFunctionTreeNode(InvokeFunction invokeSymbol) : base(invokeSymbol) { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/ProgramRootSymbol.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [Storable Class]26 [StorableType("04226CD8-A4BE-4D85-BB75-442A271C0E4E")] 27 27 [Item(ProgramRootSymbol.ProgramRootSymbolName, ProgramRootSymbol.ProgramRootSymbolDescription)] 28 28 public sealed class ProgramRootSymbol : Symbol, IReadOnlySymbol { … … 40 40 41 41 [StorableConstructor] 42 private ProgramRootSymbol( bool deserializing) : base(deserializing) { }42 private ProgramRootSymbol(StorableConstructorFlag _) : base(_) { } 43 43 private ProgramRootSymbol(ProgramRootSymbol original, Cloner cloner) : base(original, cloner) { } 44 44 public ProgramRootSymbol() : base(ProgramRootSymbol.ProgramRootSymbolName, ProgramRootSymbol.ProgramRootSymbolDescription) { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/SimpleSymbol.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 using HeuristicLab.PluginInfrastructure; 26 26 27 27 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 28 [Storable Class]28 [StorableType("71CF8C14-65CB-4393-9D46-2673A69C0729")] 29 29 [Item("SimpleSymbol", "Represents a symbol that is identified by its name.")] 30 30 [NonDiscoverableType] … … 50 50 51 51 [StorableConstructor] 52 private SimpleSymbol( bool deserializing) : base(deserializing) { }52 private SimpleSymbol(StorableConstructorFlag _) : base(_) { } 53 53 54 54 private SimpleSymbol(SimpleSymbol original, Cloner cloner) -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/StartSymbol.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 26 [Storable Class]26 [StorableType("37172E73-BBC8-448F-B694-60705C5B4E53")] 27 27 [Item(StartSymbol.StartSymbolName, StartSymbol.StartSymbolDescription)] 28 28 public sealed class StartSymbol : Symbol, IReadOnlySymbol { … … 40 40 41 41 [StorableConstructor] 42 private StartSymbol(bool deserializing) 43 : base(deserializing) { 42 private StartSymbol(StorableConstructorFlag _) : base(_) { 44 43 } 45 44 private StartSymbol(StartSymbol original, Cloner cloner) : base(original, cloner) { } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding { 29 [Storable Class]29 [StorableType("8ECC852D-3FE4-4AD8-9F70-582C7F874AE6")] 30 30 [Item("Symbol", "Represents a symbol in a symbolic function tree.")] 31 31 public abstract class Symbol : NamedItem, ISymbol { … … 80 80 81 81 [StorableConstructor] 82 protected Symbol( bool deserializing) : base(deserializing) { }82 protected Symbol(StorableConstructorFlag _) : base(_) { } 83 83 protected Symbol(Symbol original, Cloner cloner) 84 84 : base(original, cloner) {
Note: See TracChangeset
for help on using the changeset viewer.