Changeset 5572 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views

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/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4

Files:

• . (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.3)
• HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj (deleted)
• HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4.csproj (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj) (3 diffs)
• HeuristicLabProblemsExternalEvaluationGPViewsPlugin.cs.frame (modified) (2 diffs)
• Properties/AssemblyInfo.frame (modified) (2 diffs)
• VariableSymbolView.Designer.cs (modified) (6 diffs)
• VariableSymbolView.cs (modified) (5 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4.csproj

@@ -6 +6 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1778134B-866B-4CB3-BFC0-52B2FAAA5777}</ProjectGuid>
+    <ProjectGuid>{A0AF4D54-6A04-483E-A26D-97F8C1141526}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HeuristicLab.Problems.ExternalEvaluation.GP.Views</RootNamespace>
-    <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3</AssemblyName>
+    <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
@@ -148 +148 @@
       <Name>HeuristicLab.Data-3.3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
-      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
-      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
+      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
+      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
@@ -164 +164 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation.GP\3.3\HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj">
-      <Project>{E86E215D-E3CE-4244-978D-555D4E17AC09}</Project>
-      <Name>HeuristicLab.Problems.ExternalEvaluation.GP-3.3</Name>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
+      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation.GP\3.4\HeuristicLab.Problems.ExternalEvaluation.GP-3.4.csproj">
+      <Project>{B7A64A60-B538-479F-9C47-A3180C458F6C}</Project>
+      <Name>HeuristicLab.Problems.ExternalEvaluation.GP-3.4</Name>
     </ProjectReference>
   </ItemGroup>

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/HeuristicLabProblemsExternalEvaluationGPViewsPlugin.cs.frame

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.ExternalEvaluation.GP.Views {
-  [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP.Views", "3.3.3.$WCREV$")]
-  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll", PluginFileType.Assembly)]
+  [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP.Views", "3.4.0.$WCREV$")]
+  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
@@ -35 +35 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
-  [PluginDependency("HeuristicLab.Problems.ExternalEvaluation.GP", "3.3")]
-  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.ExternalEvaluation.GP", "3.4")]
+  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
   public class HeuristicLabProblemsExternalEvaluationGPViewsPlugin : PluginBase { }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/Properties/AssemblyInfo.frame

@@ -21 +21 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a46c53b9-5135-4640-9c67-a038afb891fd")]
+[assembly:Guid("EE45D88C-CC4C-4C7F-B31C-A94597E1323B")]
 
 // Version information for an assembly consists of the following four values:
@@ -33 +33 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.3.$WCREV$")]
+[assembly: AssemblyVersion("3.4.0.0")]
+[assembly: AssemblyFileVersion("3.4.0.$WCREV$")]

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/VariableSymbolView.Designer.cs

@@ -28 +28 @@
       this.parametersTabPage = new System.Windows.Forms.TabPage();
       this.groupBox2 = new System.Windows.Forms.GroupBox();
-      this.weightManipulatorNuTextBox = new System.Windows.Forms.TextBox();
+      this.weightManipulatorMuTextBox = new System.Windows.Forms.TextBox();
       this.label3 = new System.Windows.Forms.Label();
       this.weightManipulatorSigmaTextBox = new System.Windows.Forms.TextBox();
       this.label4 = new System.Windows.Forms.Label();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
-      this.weightNuTextBox = new System.Windows.Forms.TextBox();
+      this.weightMuTextBox = new System.Windows.Forms.TextBox();
       this.label1 = new System.Windows.Forms.Label();
       this.label2 = new System.Windows.Forms.Label();
@@ -91 +91 @@
       // groupBox2
       // 
-      this.groupBox2.Controls.Add(this.weightManipulatorNuTextBox);
+      this.groupBox2.Controls.Add(this.weightManipulatorMuTextBox);
       this.groupBox2.Controls.Add(this.label3);
       this.groupBox2.Controls.Add(this.weightManipulatorSigmaTextBox);
@@ -104 +104 @@
       // weightManipulatorNuTextBox
       // 
-      this.weightManipulatorNuTextBox.Location = new System.Drawing.Point(61, 31);
-      this.weightManipulatorNuTextBox.Name = "weightManipulatorNuTextBox";
-      this.weightManipulatorNuTextBox.Size = new System.Drawing.Size(100, 20);
-      this.weightManipulatorNuTextBox.TabIndex = 1;
-      this.weightManipulatorNuTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.weightTextBox_Validating);
+      this.weightManipulatorMuTextBox.Location = new System.Drawing.Point(61, 31);
+      this.weightManipulatorMuTextBox.Name = "weightManipulatorNuTextBox";
+      this.weightManipulatorMuTextBox.Size = new System.Drawing.Size(100, 20);
+      this.weightManipulatorMuTextBox.TabIndex = 1;
+      this.weightManipulatorMuTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.weightTextBox_Validating);
       // 
       // label3
@@ -138 +138 @@
       // groupBox1
       // 
-      this.groupBox1.Controls.Add(this.weightNuTextBox);
+      this.groupBox1.Controls.Add(this.weightMuTextBox);
       this.groupBox1.Controls.Add(this.label1);
       this.groupBox1.Controls.Add(this.label2);
@@ -151 +151 @@
       // weightNuTextBox
       // 
-      this.weightNuTextBox.Location = new System.Drawing.Point(61, 19);
-      this.weightNuTextBox.Name = "weightNuTextBox";
-      this.weightNuTextBox.Size = new System.Drawing.Size(100, 20);
-      this.weightNuTextBox.TabIndex = 1;
-      this.weightNuTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.weightTextBox_Validating);
+      this.weightMuTextBox.Location = new System.Drawing.Point(61, 19);
+      this.weightMuTextBox.Name = "weightNuTextBox";
+      this.weightMuTextBox.Size = new System.Drawing.Size(100, 20);
+      this.weightMuTextBox.TabIndex = 1;
+      this.weightMuTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.weightTextBox_Validating);
       // 
       // label1
@@ -213 +213 @@
     private System.Windows.Forms.TabPage parametersTabPage;
     private System.Windows.Forms.GroupBox groupBox2;
-    private System.Windows.Forms.TextBox weightManipulatorNuTextBox;
+    private System.Windows.Forms.TextBox weightManipulatorMuTextBox;
     private System.Windows.Forms.Label label3;
     private System.Windows.Forms.TextBox weightManipulatorSigmaTextBox;
     private System.Windows.Forms.Label label4;
     private System.Windows.Forms.GroupBox groupBox1;
-    private System.Windows.Forms.TextBox weightNuTextBox;
+    private System.Windows.Forms.TextBox weightMuTextBox;
     private System.Windows.Forms.Label label1;
     private System.Windows.Forms.Label label2;

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4/VariableSymbolView.cs

@@ -32 +32 @@
 namespace HeuristicLab.Problems.ExternalEvaluation.GP.Views {
   [View("Variable View")]
-  [Content(typeof(Variable), IsDefaultView = true)]
+  [Content(typeof(Variable))]
   public sealed partial class VariableSymbolView : NamedItemView {
     private CheckedItemCollectionView<StringValue> variableNamesView;
@@ -38 +38 @@
     private bool suppressDownstreamSynchronization;
 
-    public new Variable Content {
-      get { return (Variable)base.Content; }
+    public new HeuristicLab.Problems.DataAnalysis.Symbolic.Variable Content {
+      get { return (HeuristicLab.Problems.DataAnalysis.Symbolic.Variable)base.Content; }
       set { base.Content = value; }
     }
@@ -91 +91 @@
     private void SynchronizeParameters() {
       suppressDownstreamSynchronization = true;
-      weightNuTextBox.Text = Content.WeightNu.ToString();
+      weightMuTextBox.Text = Content.WeightMu.ToString();
       weightSigmaTextBox.Text = Content.WeightSigma.ToString();
-      weightManipulatorNuTextBox.Text = Content.WeightManipulatorNu.ToString();
+      weightManipulatorMuTextBox.Text = Content.WeightManipulatorMu.ToString();
       weightManipulatorSigmaTextBox.Text = Content.WeightManipulatorSigma.ToString();
       suppressDownstreamSynchronization = false;
@@ -100 +100 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      weightNuTextBox.Enabled = !ReadOnly && Content != null;
+      weightMuTextBox.Enabled = !ReadOnly && Content != null;
       weightSigmaTextBox.Enabled = !ReadOnly && Content != null;
-      weightManipulatorNuTextBox.Enabled = !ReadOnly && Content != null;
+      weightManipulatorMuTextBox.Enabled = !ReadOnly && Content != null;
       weightManipulatorSigmaTextBox.Enabled = !ReadOnly && Content != null;
     }
@@ -122 +122 @@
           e.Cancel = true;
         else {
-          if (textBox == weightNuTextBox) {
-            Content.WeightNu = value;
+          if (textBox == weightMuTextBox) {
+            Content.WeightMu = value;
           } else if (textBox == weightSigmaTextBox) {
             Content.WeightSigma = value;
-          } else if (textBox == weightManipulatorNuTextBox) {
-            Content.WeightManipulatorNu = value;
+          } else if (textBox == weightManipulatorMuTextBox) {
+            Content.WeightManipulatorMu = value;
           } else if (textBox == weightManipulatorSigmaTextBox) {
             Content.WeightManipulatorSigma = value;