Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4117


Ignore:
Timestamp:
07/27/10 18:57:01 (13 years ago)
Author:
abeham
Message:

#1041

  • Added views plugin for variable symbol to set the variable names
  • Beautified interface in the channel views (images in buttons)
  • fixed a bug in the tree interpreter regarding missing variables
  • Added missing frame file for ExternalEvaluation.Views plugin
  • Fixed build of ProtoGen in the solution file
Location:
trunk/sources
Files:
11 added
2 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r4113 r4117  
    8484    {C49CB749-8B24-4628-8003-E86475749410} = {C49CB749-8B24-4628-8003-E86475749410}
    8585    {BB6D334A-4BB6-4674-9883-31A6EBB32CAB} = {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}
     86    {1778134B-866B-4CB3-BFC0-52B2FAAA5777} = {1778134B-866B-4CB3-BFC0-52B2FAAA5777}
    8687    {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B} = {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}
    8788    {2C36CD4F-E5F5-43A4-801A-201EA895FE17} = {2C36CD4F-E5F5-43A4-801A-201EA895FE17}
     
    325326EndProject
    326327Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views-3.3", "HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views\3.3\HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views-3.3.csproj", "{C60DF094-ABC1-4313-AD82-E2EAD3FC8DF7}"
     328EndProject
     329Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3", "HeuristicLab.Problems.ExternalEvaluation.GP.Views\3.3\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj", "{1778134B-866B-4CB3-BFC0-52B2FAAA5777}"
    327330EndProject
    328331Global
     
    19081911    {DD01ED24-3750-4567-9A23-1DB676A15610}.Silverlight2|x86.ActiveCfg = Silverlight2|Any CPU
    19091912    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1913    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
    19101914    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Debug|x64.ActiveCfg = Debug|x64
     1915    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Debug|x64.Build.0 = Debug|x64
    19111916    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Debug|x86.ActiveCfg = Debug|x86
    19121917    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Debug|x86.Build.0 = Debug|x86
    19131918    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1919    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Release|Any CPU.Build.0 = Release|Any CPU
    19141920    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Release|x64.ActiveCfg = Release|x64
     1921    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Release|x64.Build.0 = Release|x64
    19151922    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Release|x86.ActiveCfg = Release|x86
     1923    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Release|x86.Build.0 = Release|x86
    19161924    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Services|Any CPU.ActiveCfg = Silverlight2|Any CPU
    19171925    {250ADE34-82FD-4BAE-86D5-985FBE589C4A}.Services|Any CPU.Build.0 = Silverlight2|Any CPU
     
    21932201    {C60DF094-ABC1-4313-AD82-E2EAD3FC8DF7}.Silverlight2|x86.ActiveCfg = Release|x86
    21942202    {C60DF094-ABC1-4313-AD82-E2EAD3FC8DF7}.Silverlight2|x86.Build.0 = Release|x86
     2203    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2204    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2205    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Debug|x64.ActiveCfg = Debug|x64
     2206    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Debug|x64.Build.0 = Debug|x64
     2207    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Debug|x86.ActiveCfg = Debug|x86
     2208    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Debug|x86.Build.0 = Debug|x86
     2209    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2210    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Release|Any CPU.Build.0 = Release|Any CPU
     2211    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Release|x64.ActiveCfg = Release|x64
     2212    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Release|x64.Build.0 = Release|x64
     2213    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Release|x86.ActiveCfg = Release|x86
     2214    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Release|x86.Build.0 = Release|x86
     2215    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Services|Any CPU.ActiveCfg = Release|x64
     2216    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Services|x64.ActiveCfg = Release|x64
     2217    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Services|x64.Build.0 = Release|x64
     2218    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Services|x86.ActiveCfg = Release|x64
     2219    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Silverlight2|Any CPU.ActiveCfg = Release|x64
     2220    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Silverlight2|x64.ActiveCfg = Release|x64
     2221    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Silverlight2|x64.Build.0 = Release|x64
     2222    {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Silverlight2|x86.ActiveCfg = Release|x64
    21952223  EndGlobalSection
    21962224  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Interpretation/TreeInterpreter.cs

    r4108 r4117  
    254254        case OpCodes.Variable: {
    255255            var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;
    256             return variables[variableTreeNode.VariableName] * variableTreeNode.Weight;
     256            if (variables.ContainsKey(variableTreeNode.VariableName))
     257              return variables[variableTreeNode.VariableName] * variableTreeNode.Weight;
     258            else return -1.0 * variableTreeNode.Weight;
    257259          }
    258260        case OpCodes.Constant: {
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationProcessChannelView.Designer.cs

    r3881 r4117  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EvaluationProcessChannelView));
    4748      this.executableTextBox = new System.Windows.Forms.TextBox();
    4849      this.browseExecutableButton = new System.Windows.Forms.Button();
     
    7374      this.executableTextBox.Name = "executableTextBox";
    7475      this.executableTextBox.ReadOnly = true;
    75       this.executableTextBox.Size = new System.Drawing.Size(243, 20);
     76      this.executableTextBox.Size = new System.Drawing.Size(284, 20);
    7677      this.executableTextBox.TabIndex = 4;
    7778      //
    7879      // browseExecutableButton
    7980      //
     81      this.browseExecutableButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
    8082      this.browseExecutableButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    81       this.browseExecutableButton.Location = new System.Drawing.Point(321, 57);
     83      this.browseExecutableButton.Location = new System.Drawing.Point(362, 57);
    8284      this.browseExecutableButton.Name = "browseExecutableButton";
    83       this.browseExecutableButton.Size = new System.Drawing.Size(67, 23);
     85      this.browseExecutableButton.Size = new System.Drawing.Size(26, 23);
    8486      this.browseExecutableButton.TabIndex = 5;
    85       this.browseExecutableButton.Text = "Browse...";
    8687      this.browseExecutableButton.UseVisualStyleBackColor = true;
    8788      this.browseExecutableButton.Click += new System.EventHandler(this.browseExecutableButton_Click);
     
    9394      this.argumentsTextBox.Location = new System.Drawing.Point(72, 85);
    9495      this.argumentsTextBox.Name = "argumentsTextBox";
    95       this.argumentsTextBox.Size = new System.Drawing.Size(243, 20);
     96      this.argumentsTextBox.Size = new System.Drawing.Size(284, 20);
    9697      this.argumentsTextBox.TabIndex = 6;
    9798      this.argumentsTextBox.Validated += new System.EventHandler(this.argumentsTextBox_Validated);
     
    122123      // startButton
    123124      //
     125      this.startButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Play;
    124126      this.startButton.Location = new System.Drawing.Point(72, 111);
    125127      this.startButton.Name = "startButton";
    126       this.startButton.Size = new System.Drawing.Size(75, 23);
     128      this.startButton.Size = new System.Drawing.Size(26, 23);
    127129      this.startButton.TabIndex = 8;
    128       this.startButton.Text = "Launch";
    129130      this.startButton.UseVisualStyleBackColor = true;
    130131      this.startButton.Click += new System.EventHandler(this.startButton_Click);
     
    132133      // terminateButton
    133134      //
     135      this.terminateButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Stop;
    134136      this.terminateButton.Enabled = false;
    135       this.terminateButton.Location = new System.Drawing.Point(153, 111);
     137      this.terminateButton.Location = new System.Drawing.Point(104, 111);
    136138      this.terminateButton.Name = "terminateButton";
    137       this.terminateButton.Size = new System.Drawing.Size(75, 23);
     139      this.terminateButton.Size = new System.Drawing.Size(26, 23);
    138140      this.terminateButton.TabIndex = 8;
    139       this.terminateButton.Text = "Terminate";
    140141      this.terminateButton.UseVisualStyleBackColor = true;
    141142      this.terminateButton.Click += new System.EventHandler(this.terminateButton_Click);
    142143      //
    143       // ExternalEvaluationProcessDriverView
     144      // EvaluationProcessChannelView
    144145      //
    145146      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     
    148149      this.Controls.Add(this.argumentsLabel);
    149150      this.Controls.Add(this.argumentsTextBox);
    150       this.Controls.Add(this.browseExecutableButton);
    151151      this.Controls.Add(this.startButton);
    152152      this.Controls.Add(this.executableLabel);
     153      this.Controls.Add(this.browseExecutableButton);
    153154      this.Controls.Add(this.terminateButton);
    154       this.Name = "ExternalEvaluationProcessDriverView";
     155      this.Name = "EvaluationProcessChannelView";
    155156      this.Size = new System.Drawing.Size(391, 139);
    156157      this.Controls.SetChildIndex(this.terminateButton, 0);
     158      this.Controls.SetChildIndex(this.browseExecutableButton, 0);
    157159      this.Controls.SetChildIndex(this.executableLabel, 0);
    158160      this.Controls.SetChildIndex(this.startButton, 0);
    159       this.Controls.SetChildIndex(this.browseExecutableButton, 0);
    160161      this.Controls.SetChildIndex(this.argumentsTextBox, 0);
    161162      this.Controls.SetChildIndex(this.argumentsLabel, 0);
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationProcessChannelView.cs

    r3904 r4117  
    2424using HeuristicLab.Core.Views;
    2525using HeuristicLab.MainForm;
     26using HeuristicLab.Common.Resources;
    2627
    2728namespace HeuristicLab.Problems.ExternalEvaluation.Views {
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationTCPChannelView.Designer.cs

    r3890 r4117  
    7575      // connectButton
    7676      //
    77       this.connectButton.Location = new System.Drawing.Point(6, 110);
     77      this.connectButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Play;
     78      this.connectButton.Location = new System.Drawing.Point(72, 110);
    7879      this.connectButton.Name = "connectButton";
    79       this.connectButton.Size = new System.Drawing.Size(75, 23);
     80      this.connectButton.Size = new System.Drawing.Size(26, 23);
    8081      this.connectButton.TabIndex = 8;
    81       this.connectButton.Text = "Connect";
    8282      this.connectButton.UseVisualStyleBackColor = true;
    8383      this.connectButton.Click += new System.EventHandler(this.connectButton_Click);
     
    8585      // disconnectButton
    8686      //
    87       this.disconnectButton.Location = new System.Drawing.Point(97, 110);
     87      this.disconnectButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Stop;
     88      this.disconnectButton.Location = new System.Drawing.Point(104, 110);
    8889      this.disconnectButton.Name = "disconnectButton";
    89       this.disconnectButton.Size = new System.Drawing.Size(75, 23);
     90      this.disconnectButton.Size = new System.Drawing.Size(26, 23);
    9091      this.disconnectButton.TabIndex = 9;
    91       this.disconnectButton.Text = "Disconnect";
    9292      this.disconnectButton.UseVisualStyleBackColor = true;
    9393      this.disconnectButton.Click += new System.EventHandler(this.disconnectButton_Click);
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj

    r4065 r4117  
    108108  </ItemGroup>
    109109  <ItemGroup>
     110    <None Include="HeuristicLabProblemsExternalEvaluationViewsPlugin.cs.frame" />
    110111    <Compile Include="EvaluationServiceClientView.cs">
    111112      <SubType>UserControl</SubType>
     
    140141      <Name>HeuristicLab.Collections-3.3</Name>
    141142    </ProjectReference>
     143    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     144      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     145      <Name>HeuristicLab.Common.Resources-3.3</Name>
     146    </ProjectReference>
    142147    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    143148      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     
    173178  </ItemGroup>
    174179  <ItemGroup>
    175     <EmbeddedResource Include="EvaluationProcessChannelView.resx">
    176       <DependentUpon>EvaluationProcessChannelView.cs</DependentUpon>
    177     </EmbeddedResource>
    178180    <EmbeddedResource Include="EvaluationServiceClientView.resx">
    179181      <DependentUpon>EvaluationServiceClientView.cs</DependentUpon>
    180     </EmbeddedResource>
    181     <EmbeddedResource Include="EvaluationTCPChannelView.resx">
    182       <DependentUpon>EvaluationTCPChannelView.cs</DependentUpon>
    183182    </EmbeddedResource>
    184183    <EmbeddedResource Include="SolutionMessageBuilderView.resx">
     
    204203  </ItemGroup>
    205204  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     205  <PropertyGroup>
     206    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     207set ProjectDir=$(ProjectDir)
     208set SolutionDir=$(SolutionDir)
     209set Outdir=$(Outdir)
     210
     211call PreBuildEvent.cmd
     212SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationViewsPlugin.cs"</PreBuildEvent>
     213  </PropertyGroup>
    206214  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    207215       Other similar extension points exist, see Microsoft.Common.targets.
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/HeuristicLabProblemsExternalEvaluationViewsPlugin.cs

    r4068 r4117  
    2323
    2424namespace HeuristicLab.Problems.ExternalEvaluation.Views {
    25   [Plugin("HeuristicLab.Problems.ExternalEvaluation.Views", "3.3.0.0")]
     25  [Plugin("HeuristicLab.Problems.ExternalEvaluation.Views", "3.3.0.4108")]
    2626  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.Views-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
    2828  [PluginDependency("HeuristicLab.Common", "3.3")]
    29   //[PluginDependency("HeuristicLab.Common.Resources", "3.3")]
     29  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3030  [PluginDependency("HeuristicLab.Core", "3.3")]
    3131  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    32   //[PluginDependency("HeuristicLab.Data", "3.3")]
    3332  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3433  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    35   //[PluginDependency("HeuristicLab.Optimization", "3.3")]
    36   //[PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    37   //[PluginDependency("HeuristicLab.Parameters", "3.3")]
    3834  [PluginDependency("HeuristicLab.Problems.ExternalEvaluation", "3.3")]
    3935  public class HeuristicLabProblemsExternalEvaluationViewsPlugin : PluginBase {
  • trunk/sources/HeuristicLab/3.3/Files.txt

    r4113 r4117  
    5656HeuristicLab.Problems.DataAnalysis.Views\3.3:HeuristicLab.Problems.DataAnalysis.Views-3.3.dll
    5757HeuristicLab.Problems.ExternalEvaluation\3.3:HeuristicLab.Problems.ExternalEvaluation-3.3.dll
     58HeuristicLab.Problems.ExternalEvaluation.Views\3.3:HeuristicLab.Problems.ExternalEvaluation.Views-3.3.dll
    5859HeuristicLab.Problems.ExternalEvaluation.GP\3.3:HeuristicLab.Problems.ExternalEvaluation.GP-3.3.dll
    59 HeuristicLab.Problems.ExternalEvaluation.Views\3.3:HeuristicLab.Problems.ExternalEvaluation.Views-3.3.dll
     60HeuristicLab.Problems.ExternalEvaluation.GP.Views\3.3:HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll
    6061HeuristicLab.Problems.Knapsack\3.3:HeuristicLab.Problems.Knapsack-3.3.dll
    6162HeuristicLab.Problems.Knapsack.Views\3.3:HeuristicLab.Problems.Knapsack.Views-3.3.dll
Note: See TracChangeset for help on using the changeset viewer.