Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/27/18 17:34:41 (6 years ago)
Author:
jzenisek
Message:

#2719: added proxy ensemble model

Location:
branches/2719_HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/2719_HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/DatastreamAnalysisOptimizerView.cs

    r14710 r15867  
    107107    }
    108108
     109    //protected override void startButton_Click(object sender, EventArgs e) {
     110    //  base.startButton_Click(sender, e);
     111    //}
     112
    109113    protected override void RegisterContentEvents() {
    110114      base.RegisterContentEvents();
    111 
    112115      Content.EnsemblesChanged += new EventHandler(Content_EnsemblesChanged);
    113116      Content.DatastreamChanged += new EventHandler(Content_DatastreamChanged);
    … …  
    157160        try {
    158161          var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
    159           if (data is IRatedEnsembleModel) {
    160             data = (IRatedEnsembleModel) data;
    161             Content.Ensembles.Add((RatedEnsembleModel) data);
     162          if (data is IProxyEnsembleModel) {
     163            data = (IProxyEnsembleModel) data;
     164            Content.Ensembles.Add((ProxyEnsembleModel) data);
    162165          }
    163166        }
    … …  
    175178      var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
    176179
    177       if (data is IRatedEnsembleModel) {
     180      if (data is IProxyEnsembleModel) {
    178181        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link; // ALT key
    179182        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move; // SHIFT key

  • branches/2719_HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/DatastreamAnalysisOptimizerView.resx

    r14547 r15867  
    119119  </resheader>
    120120  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    121     <value>186, 17</value>
     121    <value>140, 17</value>
    122122  </metadata>
    123123  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

  • branches/2719_HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/HeuristicLab.DatastreamAnalysis.Views.csproj

    r14710 r15867  
    2020    <DebugType>full</DebugType>
    2121    <Optimize>false</Optimize>
    22     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     22    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    2323    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2424    <ErrorReport>prompt</ErrorReport>
    … …  
    111111      <DependentUpon>DatastreamAnalysisOptimizerView.cs</DependentUpon>
    112112    </Compile>
    113     <Compile Include="Form1.cs">
    114       <SubType>Form</SubType>
    115     </Compile>
    116     <Compile Include="Form1.Designer.cs">
    117       <DependentUpon>Form1.cs</DependentUpon>
    118     </Compile>
    119113    <Compile Include="Plugin.cs" />
    120114    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    148142      <DependentUpon>DatastreamAnalysisOptimizerView.cs</DependentUpon>
    149143    </EmbeddedResource>
    150     <EmbeddedResource Include="Form1.resx">
    151       <DependentUpon>Form1.cs</DependentUpon>
    152     </EmbeddedResource>
    153144    <EmbeddedResource Include="RegressionEnsembleModelView.resx">
    154145      <DependentUpon>RegressionEnsembleModelView.cs</DependentUpon>

  • branches/2719_HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/HeuristicLab.DatastreamAnalysis.Views.csproj.user

    r14488 r15867  
    33  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
    44    <StartAction>Program</StartAction>
    5     <StartProgram>C:\dev\workspaces\hl-core\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
     5    <StartProgram>C:\dev\workspaces\hl-core\trunk\bin\HeuristicLab 3.3.exe</StartProgram>
     6    <StartArguments>/start:Optimizer /hideStarter</StartArguments>
    67  </PropertyGroup>
    78  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">

  • branches/2719_HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Plugin.cs

    r15025 r15867  
    2323
    2424namespace HeuristicLab.DatastreamAnalysis.Views {
    25   [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.14710")]
     25  [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.15025")]
    2626  [PluginFile("HeuristicLab.DatastreamAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • branches/2719_HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Properties/AssemblyInfo.cs

    r15025 r15867  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.4.0.0")]
    56 [assembly: AssemblyFileVersion("3.4.14.14710")]
     56[assembly: AssemblyFileVersion("3.4.14.15025")]
Note: See TracChangeset for help on using the changeset viewer.