Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/10/21 09:48:16 (3 years ago)
Author:
jzenisek
Message:

#2719 merged head of HeuristicLab.Problems.DataAnalysis into branch; added several minor items

Location:
branches/2719_HeuristicLab.DatastreamAnalysis
Files:
4 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/2719_HeuristicLab.DatastreamAnalysis

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

    r14710 r17980  
    11#region License Information
    2 
    32/* HeuristicLab
    4  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    54 *
    65 * This file is part of HeuristicLab.
    … …  
    1918 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
    2019 */
    21 
    2220#endregion
    2321

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

    r15867 r17980  
    11#region License Information
    2 
    32/* HeuristicLab
    4  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    54 *
    65 * This file is part of HeuristicLab.
    … …  
    1918 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
    2019 */
    21 
    2220#endregion
    2321

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

    r15867 r17980  
    1010    <RootNamespace>HeuristicLab.DatastreamAnalysis.Views</RootNamespace>
    1111    <AssemblyName>HeuristicLab.DatastreamAnalysis.Views-3.4</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    … …  
    2929    <DebugType>pdbonly</DebugType>
    3030    <Optimize>true</Optimize>
    31     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     31    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    3232    <DefineConstants>TRACE</DefineConstants>
    3333    <ErrorReport>prompt</ErrorReport>
    … …  
    4444  </PropertyGroup>
    4545  <ItemGroup>
     46    <Reference Include="HEAL.Attic, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     47      <SpecificVersion>False</SpecificVersion>
     48      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     49      <Private>False</Private>
     50    </Reference>
     51    <Reference Include="HeuristicLab.Analysis-3.3">
     52      <Private>False</Private>
     53    </Reference>
     54    <Reference Include="HeuristicLab.Analysis.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     55      <SpecificVersion>False</SpecificVersion>
     56      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis.Views-3.3.dll</HintPath>
     57      <Private>False</Private>
     58    </Reference>
    4659    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    4760      <SpecificVersion>False</SpecificVersion>
    4861      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     62      <Private>False</Private>
    4963    </Reference>
    5064    <Reference Include="HeuristicLab.Common-3.3">
    5165      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     66      <Private>False</Private>
    5267    </Reference>
    5368    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    5469      <SpecificVersion>False</SpecificVersion>
    5570      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     71      <Private>False</Private>
    5672    </Reference>
    5773    <Reference Include="HeuristicLab.Core-3.3">
    5874      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     75      <Private>False</Private>
    5976    </Reference>
    6077    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    6178      <SpecificVersion>False</SpecificVersion>
    6279      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     80      <Private>False</Private>
    6381    </Reference>
    6482    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    6583      <SpecificVersion>False</SpecificVersion>
    6684      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     85      <Private>False</Private>
    6786    </Reference>
    6887    <Reference Include="HeuristicLab.MainForm-3.3">
    6988      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     89      <Private>False</Private>
    7090    </Reference>
    7191    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    7292      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     93      <Private>False</Private>
    7394    </Reference>
    7495    <Reference Include="HeuristicLab.Optimization-3.3">
    7596      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     97      <Private>False</Private>
    7698    </Reference>
    7799    <Reference Include="HeuristicLab.Optimization.Views-3.3">
    78100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     101      <Private>False</Private>
    79102    </Reference>
    80103    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    81104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     105      <Private>False</Private>
    82106    </Reference>
    83107    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    84108      <SpecificVersion>False</SpecificVersion>
    85109      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     110      <Private>False</Private>
    86111    </Reference>
    87112    <Reference Include="System" />
    … …  
    111136      <DependentUpon>DatastreamAnalysisOptimizerView.cs</DependentUpon>
    112137    </Compile>
     138    <Compile Include="ExtendedDataTableView.cs">
     139      <SubType>UserControl</SubType>
     140    </Compile>
     141    <Compile Include="ExtendedDataTableView.Designer.cs">
     142      <DependentUpon>ExtendedDataTableView.cs</DependentUpon>
     143    </Compile>
    113144    <Compile Include="Plugin.cs" />
    114145    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    119150      <DependentUpon>RegressionEnsembleModelView.cs</DependentUpon>
    120151    </Compile>
     152    <Compile Include="TopicSelectorDialog.cs">
     153      <SubType>Form</SubType>
     154    </Compile>
     155    <Compile Include="TopicSelectorDialog.Designer.cs">
     156      <DependentUpon>TopicSelectorDialog.cs</DependentUpon>
     157    </Compile>
    121158  </ItemGroup>
    122159  <ItemGroup>
    … …  
    129166      <Project>{8ba00ca6-71f6-415b-b5b7-da3d64318750}</Project>
    130167      <Name>HeuristicLab.DatastreamAnalysis</Name>
     168      <Private>False</Private>
    131169    </ProjectReference>
    132170    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    133171      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
    134172      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     173      <Private>False</Private>
    135174    </ProjectReference>
    136175  </ItemGroup>

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

    r15867 r17980  
    2323
    2424namespace HeuristicLab.DatastreamAnalysis.Views {
    25   [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.15025")]
     25  [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.15867")]
    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

    r15867 r17980  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.4.0.0")]
    56 [assembly: AssemblyFileVersion("3.4.14.15025")]
     56[assembly: AssemblyFileVersion("3.4.14.15867")]

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

    r14536 r17980  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Linq;
    24 using System.Windows.Forms;
    25 using HeuristicLab.Common;
    2622using HeuristicLab.Core;
    2723using HeuristicLab.Core.Views;
    2824using HeuristicLab.MainForm;
    29 using HeuristicLab.MainForm.WindowsForms;
    3025using HeuristicLab.Problems.DataAnalysis;
    3126
Note: See TracChangeset for help on using the changeset viewer.