Changeset 8471 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views

Timestamp:

08/10/12 17:35:12 (12 years ago)

Author:

abeham

Message:

#1913: integrated branch into trunk

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• NcaDimensionReductionView.Designer.cs (copied) (copied from branches/NCA/HeuristicLab.Algorithms.NCA.Views/3.3/NCADimensionReductionView.Designer.cs) (1 diff)
• NcaDimensionReductionView.cs (copied) (copied from branches/NCA/HeuristicLab.Algorithms.NCA.Views/3.3/NCADimensionReductionView.cs) (1 diff)
• Plugin.cs.frame (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

@@ -154 +154 @@
       <DependentUpon>KMeansClusteringModelView.cs</DependentUpon>
     </Compile>
+    <Compile Include="NcaDimensionReductionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="NcaDimensionReductionView.Designer.cs">
+      <DependentUpon>NcaDimensionReductionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="SupportVectorMachineModelSupportVectorsView.cs">
@@ -184 +190 @@
       <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
       <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
+      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
+      <Name>HeuristicLab.Analysis-3.3</Name>
       <Private>False</Private>
     </ProjectReference>

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/NcaDimensionReductionView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Algorithms.NCA.Views {
+namespace HeuristicLab.Algorithms.DataAnalysis.Views {
   partial class NCADimensionReductionView {
     /// <summary> 

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/NcaDimensionReductionView.cs

@@ -29 +29 @@
 using HeuristicLab.Problems.DataAnalysis.Views;
 
-namespace HeuristicLab.Algorithms.NCA.Views {
+namespace HeuristicLab.Algorithms.DataAnalysis.Views {
   [View("Dimension Reduction")]
   [Content(typeof(INcaClassificationSolution), IsDefaultView = false)]

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Plugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Algorithms.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")]
+  [PluginDependency("HeuristicLab.Analysis", "3.3")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
@@ -41 +43 @@
   [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views", "3.4")]
   public class HeuristicLabAlgorithmsDataAnalysisViewsPlugin : PluginBase {
   }