Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5572 for branches


Ignore:
Timestamp:
02/28/11 19:00:35 (13 years ago)
Author:
gkronber
Message:

#1418 pulled external evaluation plugin to version 3.4

Location:
branches/DataAnalysis Refactoring
Files:
5 deleted
8 edited
4 copied

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis Refactoring/HeuristicLab 3.3.sln

    r5496 r5572  
    363363EndProject
    364364Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis.Views-3.4", "HeuristicLab.Algorithms.DataAnalysis.Views\3.4\HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj", "{A2330DB0-413D-4424-B4E6-591118E2B9F8}"
     365EndProject
     366Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.GP-3.4", "HeuristicLab.Problems.ExternalEvaluation.GP\3.4\HeuristicLab.Problems.ExternalEvaluation.GP-3.4.csproj", "{B7A64A60-B538-479F-9C47-A3180C458F6C}"
     367EndProject
     368Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4", "HeuristicLab.Problems.ExternalEvaluation.GP.Views\3.4\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4.csproj", "{A0AF4D54-6A04-483E-A26D-97F8C1141526}"
    365369EndProject
    366370Global
     
    16611665    {A2330DB0-413D-4424-B4E6-591118E2B9F8}.Release|x86.ActiveCfg = Release|x86
    16621666    {A2330DB0-413D-4424-B4E6-591118E2B9F8}.Release|x86.Build.0 = Release|x86
     1667    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1668    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1669    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Debug|x64.ActiveCfg = Debug|x64
     1670    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Debug|x64.Build.0 = Debug|x64
     1671    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Debug|x86.ActiveCfg = Debug|x86
     1672    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Debug|x86.Build.0 = Debug|x86
     1673    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1674    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Release|Any CPU.Build.0 = Release|Any CPU
     1675    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Release|x64.ActiveCfg = Release|x64
     1676    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Release|x64.Build.0 = Release|x64
     1677    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Release|x86.ActiveCfg = Release|x86
     1678    {B7A64A60-B538-479F-9C47-A3180C458F6C}.Release|x86.Build.0 = Release|x86
     1679    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1680    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1681    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Debug|x64.ActiveCfg = Debug|x64
     1682    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Debug|x64.Build.0 = Debug|x64
     1683    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Debug|x86.ActiveCfg = Debug|x86
     1684    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Debug|x86.Build.0 = Debug|x86
     1685    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1686    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Release|Any CPU.Build.0 = Release|Any CPU
     1687    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Release|x64.ActiveCfg = Release|x64
     1688    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Release|x64.Build.0 = Release|x64
     1689    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Release|x86.ActiveCfg = Release|x86
     1690    {A0AF4D54-6A04-483E-A26D-97F8C1141526}.Release|x86.Build.0 = Release|x86
    16631691  EndGlobalSection
    16641692  GlobalSection(SolutionProperties) = preSolution
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4.csproj

    r5563 r5572  
    66    <ProductVersion>8.0.30703</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{1778134B-866B-4CB3-BFC0-52B2FAAA5777}</ProjectGuid>
     8    <ProjectGuid>{A0AF4D54-6A04-483E-A26D-97F8C1141526}</ProjectGuid>
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    1111    <RootNamespace>HeuristicLab.Problems.ExternalEvaluation.GP.Views</RootNamespace>
    12     <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3</AssemblyName>
     12    <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
     
    148148      <Name>HeuristicLab.Data-3.3</Name>
    149149    </ProjectReference>
    150     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    151       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    152       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     150    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     151      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     152      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    153153    </ProjectReference>
    154154    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     
    164164      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    165165    </ProjectReference>
    166     <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation.GP\3.3\HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj">
    167       <Project>{E86E215D-E3CE-4244-978D-555D4E17AC09}</Project>
    168       <Name>HeuristicLab.Problems.ExternalEvaluation.GP-3.3</Name>
     166    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     167      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
     168      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     169    </ProjectReference>
     170    <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation.GP\3.4\HeuristicLab.Problems.ExternalEvaluation.GP-3.4.csproj">
     171      <Project>{B7A64A60-B538-479F-9C47-A3180C458F6C}</Project>
     172      <Name>HeuristicLab.Problems.ExternalEvaluation.GP-3.4</Name>
    169173    </ProjectReference>
    170174  </ItemGroup>
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/HeuristicLabProblemsExternalEvaluationGPViewsPlugin.cs.frame

    r5446 r5572  
    2727
    2828namespace HeuristicLab.Problems.ExternalEvaluation.GP.Views {
    29   [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP.Views", "3.3.3.$WCREV$")]
    30   [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll", PluginFileType.Assembly)]
     29  [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP.Views", "3.4.0.$WCREV$")]
     30  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4.dll", PluginFileType.Assembly)]
    3131  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3232  [PluginDependency("HeuristicLab.Core", "3.3")]
     
    3535  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3636  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    37   [PluginDependency("HeuristicLab.Problems.ExternalEvaluation.GP", "3.3")]
    38   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3")]
     37  [PluginDependency("HeuristicLab.Problems.ExternalEvaluation.GP", "3.4")]
     38  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
    3939  public class HeuristicLabProblemsExternalEvaluationGPViewsPlugin : PluginBase { }
    4040}
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/Properties/AssemblyInfo.frame

    r5446 r5572  
    2121
    2222// The following GUID is for the ID of the typelib if this project is exposed to COM
    23 [assembly: Guid("a46c53b9-5135-4640-9c67-a038afb891fd")]
     23[assembly:Guid("EE45D88C-CC4C-4C7F-B31C-A94597E1323B")]
    2424
    2525// Version information for an assembly consists of the following four values:
     
    3333// by using the '*' as shown below:
    3434// [assembly: AssemblyVersion("1.0.*")]
    35 [assembly: AssemblyVersion("3.3.0.0")]
    36 [assembly: AssemblyFileVersion("3.3.3.$WCREV$")]
     35[assembly: AssemblyVersion("3.4.0.0")]
     36[assembly: AssemblyFileVersion("3.4.0.$WCREV$")]
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/VariableSymbolView.Designer.cs

    r5466 r5572  
    2828      this.parametersTabPage = new System.Windows.Forms.TabPage();
    2929      this.groupBox2 = new System.Windows.Forms.GroupBox();
    30       this.weightManipulatorNuTextBox = new System.Windows.Forms.TextBox();
     30      this.weightManipulatorMuTextBox = new System.Windows.Forms.TextBox();
    3131      this.label3 = new System.Windows.Forms.Label();
    3232      this.weightManipulatorSigmaTextBox = new System.Windows.Forms.TextBox();
    3333      this.label4 = new System.Windows.Forms.Label();
    3434      this.groupBox1 = new System.Windows.Forms.GroupBox();
    35       this.weightNuTextBox = new System.Windows.Forms.TextBox();
     35      this.weightMuTextBox = new System.Windows.Forms.TextBox();
    3636      this.label1 = new System.Windows.Forms.Label();
    3737      this.label2 = new System.Windows.Forms.Label();
     
    9191      // groupBox2
    9292      //
    93       this.groupBox2.Controls.Add(this.weightManipulatorNuTextBox);
     93      this.groupBox2.Controls.Add(this.weightManipulatorMuTextBox);
    9494      this.groupBox2.Controls.Add(this.label3);
    9595      this.groupBox2.Controls.Add(this.weightManipulatorSigmaTextBox);
     
    104104      // weightManipulatorNuTextBox
    105105      //
    106       this.weightManipulatorNuTextBox.Location = new System.Drawing.Point(61, 31);
    107       this.weightManipulatorNuTextBox.Name = "weightManipulatorNuTextBox";
    108       this.weightManipulatorNuTextBox.Size = new System.Drawing.Size(100, 20);
    109       this.weightManipulatorNuTextBox.TabIndex = 1;
    110       this.weightManipulatorNuTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.weightTextBox_Validating);
     106      this.weightManipulatorMuTextBox.Location = new System.Drawing.Point(61, 31);
     107      this.weightManipulatorMuTextBox.Name = "weightManipulatorNuTextBox";
     108      this.weightManipulatorMuTextBox.Size = new System.Drawing.Size(100, 20);
     109      this.weightManipulatorMuTextBox.TabIndex = 1;
     110      this.weightManipulatorMuTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.weightTextBox_Validating);
    111111      //
    112112      // label3
     
    138138      // groupBox1
    139139      //
    140       this.groupBox1.Controls.Add(this.weightNuTextBox);
     140      this.groupBox1.Controls.Add(this.weightMuTextBox);
    141141      this.groupBox1.Controls.Add(this.label1);
    142142      this.groupBox1.Controls.Add(this.label2);
     
    151151      // weightNuTextBox
    152152      //
    153       this.weightNuTextBox.Location = new System.Drawing.Point(61, 19);
    154       this.weightNuTextBox.Name = "weightNuTextBox";
    155       this.weightNuTextBox.Size = new System.Drawing.Size(100, 20);
    156       this.weightNuTextBox.TabIndex = 1;
    157       this.weightNuTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.weightTextBox_Validating);
     153      this.weightMuTextBox.Location = new System.Drawing.Point(61, 19);
     154      this.weightMuTextBox.Name = "weightNuTextBox";
     155      this.weightMuTextBox.Size = new System.Drawing.Size(100, 20);
     156      this.weightMuTextBox.TabIndex = 1;
     157      this.weightMuTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.weightTextBox_Validating);
    158158      //
    159159      // label1
     
    213213    private System.Windows.Forms.TabPage parametersTabPage;
    214214    private System.Windows.Forms.GroupBox groupBox2;
    215     private System.Windows.Forms.TextBox weightManipulatorNuTextBox;
     215    private System.Windows.Forms.TextBox weightManipulatorMuTextBox;
    216216    private System.Windows.Forms.Label label3;
    217217    private System.Windows.Forms.TextBox weightManipulatorSigmaTextBox;
    218218    private System.Windows.Forms.Label label4;
    219219    private System.Windows.Forms.GroupBox groupBox1;
    220     private System.Windows.Forms.TextBox weightNuTextBox;
     220    private System.Windows.Forms.TextBox weightMuTextBox;
    221221    private System.Windows.Forms.Label label1;
    222222    private System.Windows.Forms.Label label2;
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/VariableSymbolView.cs

    r5445 r5572  
    3232namespace HeuristicLab.Problems.ExternalEvaluation.GP.Views {
    3333  [View("Variable View")]
    34   [Content(typeof(Variable), IsDefaultView = true)]
     34  [Content(typeof(Variable))]
    3535  public sealed partial class VariableSymbolView : NamedItemView {
    3636    private CheckedItemCollectionView<StringValue> variableNamesView;
     
    3838    private bool suppressDownstreamSynchronization;
    3939
    40     public new Variable Content {
    41       get { return (Variable)base.Content; }
     40    public new HeuristicLab.Problems.DataAnalysis.Symbolic.Variable Content {
     41      get { return (HeuristicLab.Problems.DataAnalysis.Symbolic.Variable)base.Content; }
    4242      set { base.Content = value; }
    4343    }
     
    9191    private void SynchronizeParameters() {
    9292      suppressDownstreamSynchronization = true;
    93       weightNuTextBox.Text = Content.WeightNu.ToString();
     93      weightMuTextBox.Text = Content.WeightMu.ToString();
    9494      weightSigmaTextBox.Text = Content.WeightSigma.ToString();
    95       weightManipulatorNuTextBox.Text = Content.WeightManipulatorNu.ToString();
     95      weightManipulatorMuTextBox.Text = Content.WeightManipulatorMu.ToString();
    9696      weightManipulatorSigmaTextBox.Text = Content.WeightManipulatorSigma.ToString();
    9797      suppressDownstreamSynchronization = false;
     
    100100    protected override void SetEnabledStateOfControls() {
    101101      base.SetEnabledStateOfControls();
    102       weightNuTextBox.Enabled = !ReadOnly && Content != null;
     102      weightMuTextBox.Enabled = !ReadOnly && Content != null;
    103103      weightSigmaTextBox.Enabled = !ReadOnly && Content != null;
    104       weightManipulatorNuTextBox.Enabled = !ReadOnly && Content != null;
     104      weightManipulatorMuTextBox.Enabled = !ReadOnly && Content != null;
    105105      weightManipulatorSigmaTextBox.Enabled = !ReadOnly && Content != null;
    106106    }
     
    122122          e.Cancel = true;
    123123        else {
    124           if (textBox == weightNuTextBox) {
    125             Content.WeightNu = value;
     124          if (textBox == weightMuTextBox) {
     125            Content.WeightMu = value;
    126126          } else if (textBox == weightSigmaTextBox) {
    127127            Content.WeightSigma = value;
    128           } else if (textBox == weightManipulatorNuTextBox) {
    129             Content.WeightManipulatorNu = value;
     128          } else if (textBox == weightManipulatorMuTextBox) {
     129            Content.WeightManipulatorMu = value;
    130130          } else if (textBox == weightManipulatorSigmaTextBox) {
    131131            Content.WeightManipulatorSigma = value;
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.4/HeuristicLab.Problems.ExternalEvaluation.GP-3.4.csproj

    r5563 r5572  
    66    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{E86E215D-E3CE-4244-978D-555D4E17AC09}</ProjectGuid>
     8    <ProjectGuid>{B7A64A60-B538-479F-9C47-A3180C458F6C}</ProjectGuid>
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    1111    <RootNamespace>HeuristicLab.Problems.ExternalEvaluation.GP</RootNamespace>
    12     <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.GP-3.3</AssemblyName>
     12    <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.GP-3.4</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <SignAssembly>true</SignAssembly>
     
    107108  <ItemGroup>
    108109    <None Include="HeuristicLabProblemsExternalEvaluationGPPlugin.cs.frame" />
    109     <Compile Include="Grammar\FullFunctionalExpressionGrammar.cs" />
    110110    <Compile Include="HeuristicLabProblemsExternalEvaluationGPPlugin.cs" />
    111     <Compile Include="Interpretation\ITreeInterpreter.cs" />
    112111    <Compile Include="Properties\AssemblyInfo.cs" />
    113     <Compile Include="Interpretation\TreeInterpreter.cs" />
    114112    <None Include="Properties\AssemblyInfo.frame" />
    115113    <Compile Include="SymbolicExpressionTreeBinaryConverter.cs" />
    116114    <Compile Include="SymbolicExpressionTreeConverter.cs" />
    117115    <Compile Include="SymbolicExpressionTreeStringConverter.cs" />
    118     <Compile Include="Symbols\Addition.cs" />
    119     <Compile Include="Symbols\And.cs" />
    120     <Compile Include="Symbols\Average.cs" />
    121     <Compile Include="Symbols\Constant.cs" />
    122     <Compile Include="Symbols\ConstantTreeNode.cs" />
    123     <Compile Include="Symbols\Cosine.cs" />
    124     <Compile Include="Symbols\Division.cs" />
    125     <Compile Include="Symbols\Exponential.cs" />
    126     <Compile Include="Symbols\GreaterThan.cs" />
    127     <Compile Include="Symbols\IfThenElse.cs" />
    128     <Compile Include="Symbols\LessThan.cs" />
    129     <Compile Include="Symbols\Logarithm.cs" />
    130     <Compile Include="Symbols\Multiplication.cs" />
    131     <Compile Include="Symbols\Not.cs" />
    132     <Compile Include="Symbols\Or.cs" />
    133     <Compile Include="Symbols\Sine.cs" />
    134     <Compile Include="Symbols\Subtraction.cs" />
    135     <Compile Include="Symbols\Tangent.cs" />
    136     <Compile Include="Symbols\Variable.cs" />
    137     <Compile Include="Symbols\VariableTreeNode.cs" />
    138116  </ItemGroup>
    139117  <ItemGroup>
     
    150128      <Name>HeuristicLab.Core-3.3</Name>
    151129    </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    153       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    154       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     130    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     131      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     132      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    155133    </ProjectReference>
    156134    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS\HeuristicLab.ProtobufCS-0.9.1.csproj">
     
    181159  <ItemGroup>
    182160    <None Include="HeuristicLab.snk" />
    183   </ItemGroup>
    184   <ItemGroup>
    185     <Content Include="Grammar\FullGrammar.txt" />
    186161  </ItemGroup>
    187162  <ItemGroup>
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.4/HeuristicLabProblemsExternalEvaluationGPPlugin.cs.frame

    r5446 r5572  
    2323
    2424namespace HeuristicLab.Problems.ExternalEvaluation.GP {
    25   [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP", "3.3.3.$WCREV$")]
    26   [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP-3.3.dll", PluginFileType.Assembly)]
     25  [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP", "3.4.0.$WCREV$")]
     26  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP-3.4.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
    2828  [PluginDependency("HeuristicLab.Core", "3.3")]
    29   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3")]
     29  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
    3030  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    3131  [PluginDependency("HeuristicLab.Problems.ExternalEvaluation", "3.3")]
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.4/Properties/AssemblyInfo.frame

    r5446 r5572  
    2121
    2222// The following GUID is for the ID of the typelib if this project is exposed to COM
    23 [assembly: Guid("a5a26a1d-5c47-41b7-b827-712377d873c5")]
     23[assembly: Guid("9DCFFA77-344D-4A3A-A444-75FF7B242583")]
    2424
    2525// Version information for an assembly consists of the following four values:
     
    3333// by using the '*' as shown below:
    3434// [assembly: AssemblyVersion("1.0.*")]
    35 [assembly: AssemblyVersion("3.3.0.0")]
    36 [assembly: AssemblyFileVersion("3.3.3.$WCREV$")]
     35[assembly: AssemblyVersion("3.4.0.0")]
     36[assembly: AssemblyFileVersion("3.4.0.$WCREV$")]
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.4/SymbolicExpressionTreeStringConverter.cs

    r5445 r5572  
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters;
    2827
    2928namespace HeuristicLab.Problems.ExternalEvaluation.GP {
Note: See TracChangeset for help on using the changeset viewer.