Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.5
- Timestamp:
- 03/28/19 16:54:20 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 8 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationExpressionGrammar.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 H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.DataAnalysis.Symbolic; 27 27 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 28 28 29 29 namespace HeuristicLab.Problems.ExternalEvaluation.GP { 30 [Storable Class]30 [StorableType("747A7784-EF15-4CEF-A621-79A9071A69F5")] 31 31 [Item("ExternalEvaluationExpressionGrammar", "Represents a grammar for functional expressions using all available functions.")] 32 32 public class ExternalEvaluationExpressionGrammar : SymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar { … … 34 34 private HeuristicLab.Problems.DataAnalysis.Symbolic.Variable variableSymbol; 35 35 [StorableConstructor] 36 protected ExternalEvaluationExpressionGrammar( bool deserializing) : base(deserializing) { }36 protected ExternalEvaluationExpressionGrammar(StorableConstructorFlag _) : base(_) { } 37 37 protected ExternalEvaluationExpressionGrammar(ExternalEvaluationExpressionGrammar original, Cloner cloner) : base(original, cloner) { } 38 38 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationSymbolicExpressionTreeBinaryConverter.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.Encodings.SymbolicExpressionTreeEncoding; 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 28 using System; 28 29 29 30 namespace HeuristicLab.Problems.ExternalEvaluation.GP { 30 [Item("SymbolicExpressionTreeBinaryConverter", "Converts a symbolic expression tree into a binary representation by iterating over all nodes in a prefix way. The binary format is defined in HeuristicLab.Persistence.")] 31 [StorableClass] 31 [Item("SymbolicExpressionTreeBinaryConverter", "Converts a symbolic expression tree into a binary representation by prefix iteration over all nodes in the tree. The binary format is defined in HeuristicLab.Persistence.")] 32 [StorableType("E3C9DE32-6EF2-4BA5-AFDF-23AE7D198AC6")] 33 [Obsolete("Use the SymbolicExpressionTreeProtobufConverter instead; The SymbolicExpressionTreeBinaryConverter uses the old serialization format and will be removed in the next major release of HeuristicLab.")] 32 34 public class SymbolicExpressionTreeBinaryConverter : SymbolicExpressionTreeConverter { 33 35 [StorableConstructor] 34 protected SymbolicExpressionTreeBinaryConverter( bool deserializing) : base(deserializing) { }36 protected SymbolicExpressionTreeBinaryConverter(StorableConstructorFlag _) : base(_) { } 35 37 protected SymbolicExpressionTreeBinaryConverter(SymbolicExpressionTreeBinaryConverter original, Cloner cloner) 36 38 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationSymbolicExpressionTreeConverter.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.Encodings.SymbolicExpressionTreeEncoding; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.ExternalEvaluation.GP { 29 29 [Item("SymbolicExpressionTreeStringConverter", "Abstract base class for symbolic expression tree converters.")] 30 [Storable Class]30 [StorableType("AA6D2726-06C7-4E12-92EC-24BFADAE7402")] 31 31 public abstract class SymbolicExpressionTreeConverter : Item, IItemToSolutionMessageConverter { 32 32 private static readonly Type[] itemTypes = new Type[] { typeof(SymbolicExpressionTree) }; 33 33 34 34 [StorableConstructor] 35 protected SymbolicExpressionTreeConverter( bool deserializing) : base(deserializing) { }35 protected SymbolicExpressionTreeConverter(StorableConstructorFlag _) : base(_) { } 36 36 protected SymbolicExpressionTreeConverter(SymbolicExpressionTreeConverter original, Cloner cloner) 37 37 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationSymbolicExpressionTreeStringConverter.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.Encodings.SymbolicExpressionTreeEncoding; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.ExternalEvaluation.GP { 29 29 [Item("SymbolicExpressionTreeStringConverter", "Converts a symbolic expression tree into a string representation by iterating over all nodes in a prefix way. The string is added to the SolutionMessage's StringVars.")] 30 [Storable Class]30 [StorableType("0C11DC1E-D6A3-4BDB-A236-132D855F3A45")] 31 31 public class SymbolicExpressionTreeStringConverter : SymbolicExpressionTreeConverter { 32 32 private ExternalEvaluationSymbolicExpressionTreeStringFormatter formatter; 33 33 34 34 [StorableConstructor] 35 protected SymbolicExpressionTreeStringConverter( bool deserializing) : base(deserializing) { }35 protected SymbolicExpressionTreeStringConverter(StorableConstructorFlag _) : base(_) { } 36 36 protected SymbolicExpressionTreeStringConverter(SymbolicExpressionTreeStringConverter original, Cloner cloner) 37 37 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationSymbolicExpressionTreeStringFormatter.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 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 28 28 using HeuristicLab.Problems.DataAnalysis.Symbolic; … … 33 33 34 34 [Item("ExternalEvaluationSymbolicExpressionTreeStringFormatter", "A string formatter for symbolic expression trees for external evaluation.")] 35 [Storable Class]35 [StorableType("6621B850-D3F2-4824-B6A8-19F4969AFB44")] 36 36 public class ExternalEvaluationSymbolicExpressionTreeStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter { 37 37 … … 39 39 40 40 [StorableConstructor] 41 protected ExternalEvaluationSymbolicExpressionTreeStringFormatter( bool deserializing) : base(deserializing) { }41 protected ExternalEvaluationSymbolicExpressionTreeStringFormatter(StorableConstructorFlag _) : base(_) { } 42 42 protected ExternalEvaluationSymbolicExpressionTreeStringFormatter(ExternalEvaluationSymbolicExpressionTreeStringFormatter original, Cloner cloner) 43 43 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/HeuristicLab.Problems.ExternalEvaluation.GP-3.5.csproj
r13372 r16723 11 11 <RootNamespace>HeuristicLab.Problems.ExternalEvaluation.GP</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.GP-3.5</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <TargetFrameworkProfile> 15 15 </TargetFrameworkProfile> … … 122 122 <None Include="Plugin.cs.frame" /> 123 123 <Compile Include="ExternalEvaluationExpressionGrammar.cs" /> 124 <Compile Include="SymbolicExpressionTreeProtobufConverter.cs" /> 124 125 <Compile Include="ExternalEvaluationSymbolicExpressionTreeBinaryConverter.cs" /> 125 126 <Compile Include="ExternalEvaluationSymbolicExpressionTreeConverter.cs" /> … … 194 195 <Private>False</Private> 195 196 </ProjectReference> 197 </ItemGroup> 198 <ItemGroup> 199 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 200 <SpecificVersion>False</SpecificVersion> 201 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 202 <Private>False</Private> 203 </Reference> 196 204 </ItemGroup> 197 205 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/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. … … 25 25 [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP", "Provides a symbolic expression tree grammar and formatters for external evaluation problems.", "3.5.10.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP-3.5.dll", PluginFileType.Assembly)] 27 [PluginDependency("HeuristicLab.Attic", "1.0")] 27 28 [PluginDependency("HeuristicLab.Common", "3.3")] 28 29 [PluginDependency("HeuristicLab.Core", "3.3")]
Note: See TracChangeset
for help on using the changeset viewer.