Changeset 4820


Ignore:
Timestamp:
11/16/10 17:06:45 (8 years ago)
Author:
swinkler
Message:

Worked on symbolic expression tree formatters: Added interface, founded new project for formatters. (#1270)

Location:
branches/SmalltalkExport
Files:
10 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • branches/SmalltalkExport/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj

    r4804 r4820  
    208208  </PropertyGroup>
    209209  <PropertyGroup>
    210     <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    211 set ProjectDir=$(ProjectDir)
    212 set SolutionDir=$(SolutionDir)
    213 set Outdir=$(Outdir)
    214 set Platform=$(PlatformName)
    215 
    216 call UpdateLocalInstallation.cmd
    217 </PostBuildEvent>
     210    <PostBuildEvent>copy "$(TargetPath)" "C:\Program Files\HeuristicLab 3.3\"</PostBuildEvent>
    218211  </PropertyGroup>
    219212</Project>
  • branches/SmalltalkExport/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs

    r4803 r4820  
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
    28   [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views", "3.3.1.0")]
     28  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views", "3.3.1.4804")]
    2929  [PluginFile("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/SmalltalkExport/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/Properties/AssemblyInfo.cs

    r4803 r4820  
    4545
    4646[assembly: AssemblyVersion("3.3.0.0")]
    47 [assembly: AssemblyFileVersion("3.3.1.0")]
     47[assembly: AssemblyFileVersion("3.3.1.4804")]
  • branches/SmalltalkExport/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj

    r4804 r4820  
    160160    <Compile Include="Compiler\Instruction.cs" />
    161161    <Compile Include="Compiler\SymbolicExpressionTreeCompiler.cs" />
     162    <Compile Include="Interfaces\ISymbolicExpressionTreeStringFormatter.cs" />
    162163    <Compile Include="Creators\SymbolicExpressionTreeCreator.cs" />
    163164    <Compile Include="Crossovers\CrossoverPoint.cs" />
     
    227228    </BootstrapperPackage>
    228229  </ItemGroup>
    229   <ItemGroup>
    230     <WCFMetadata Include="Service References\" />
    231   </ItemGroup>
    232230  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    233231  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/SmalltalkExport/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs

    r4803 r4820  
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    28   [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3.1.0")]
     28  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3.1.4804")]
    2929  [PluginFile("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Analysis", "3.3.1.0")]
  • branches/SmalltalkExport/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Properties/AssemblyInfo.cs

    r4803 r4820  
    4545
    4646[assembly: AssemblyVersion("3.3.0.0")]
    47 [assembly: AssemblyFileVersion("3.3.1.0")]
     47[assembly: AssemblyFileVersion("3.3.1.4804")]
  • branches/SmalltalkExport/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeStringFormatter.cs

    r4803 r4820  
    2121
    2222using System.Text;
     23using HeuristicLab.Core;
     24using HeuristicLab.Common;
     25using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2326
    2427namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    25  
    26   public class SymbolicExpressionTreeStringFormatter {
    27    
     28
     29  [Item("SymbolicExpressionTreeStringFormatter", "The default string formatter for symbolic expression trees.")]
     30  [StorableClass]
     31  public class SymbolicExpressionTreeStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
     32
    2833    public bool Indent { get; set; }
    29    
     34
     35    [StorableConstructor]
     36    protected SymbolicExpressionTreeStringFormatter(bool deserializing) : base(deserializing) { }
     37    protected SymbolicExpressionTreeStringFormatter(SymbolicExpressionTreeStringFormatter original, Cloner cloner) : base(original, cloner) { }
    3038    public SymbolicExpressionTreeStringFormatter()
    3139      : base() {
     
    5967      return strBuilder.ToString();
    6068    }
     69
     70    public override IDeepCloneable Clone(Cloner cloner) {
     71      return new SymbolicExpressionTreeStringFormatter(this, cloner);
     72    }
     73
    6174  }
     75
    6276}
  • branches/SmalltalkExport/SmalltalkExport.sln

    r4803 r4820  
    55EndProject
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3", "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj", "{6F42C5F8-16CD-43EE-8208-FD4573A69D85}"
     7EndProject
     8Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters", "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters.csproj", "{FF6261F7-B9F4-46A7-A5F7-E0FEC6D555BA}"
    79EndProject
    810Global
     
    4042    {6F42C5F8-16CD-43EE-8208-FD4573A69D85}.Release|x86.ActiveCfg = Release|x86
    4143    {6F42C5F8-16CD-43EE-8208-FD4573A69D85}.Release|x86.Build.0 = Release|x86
     44    {FF6261F7-B9F4-46A7-A5F7-E0FEC6D555BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     45    {FF6261F7-B9F4-46A7-A5F7-E0FEC6D555BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
     46    {FF6261F7-B9F4-46A7-A5F7-E0FEC6D555BA}.Debug|x64.ActiveCfg = Debug|Any CPU
     47    {FF6261F7-B9F4-46A7-A5F7-E0FEC6D555BA}.Debug|x86.ActiveCfg = Debug|Any CPU
     48    {FF6261F7-B9F4-46A7-A5F7-E0FEC6D555BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
     49    {FF6261F7-B9F4-46A7-A5F7-E0FEC6D555BA}.Release|Any CPU.Build.0 = Release|Any CPU
     50    {FF6261F7-B9F4-46A7-A5F7-E0FEC6D555BA}.Release|x64.ActiveCfg = Release|Any CPU
     51    {FF6261F7-B9F4-46A7-A5F7-E0FEC6D555BA}.Release|x86.ActiveCfg = Release|Any CPU
    4252  EndGlobalSection
    4353  GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.