Changeset 3797

Timestamp:

05/12/10 16:40:16 (15 years ago)

Author:

mkommend

Message:

corrected namespaces and removed resources files in HL 3.3 solution (ticket #893)

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationTypeView.Designer.cs (modified) (1 diff)
• HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationTypeView.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/GraphicalSymbolicExpressionTreeView.resx (deleted)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/Properties/Resources.Designer.cs (deleted)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/Properties/Resources.resx (deleted)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionTreeChart.resx (deleted)
• HeuristicLab.MainForm/3.3/HeuristicLabMainFormPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/HeuristicLabOperatorsViewsGraphVisualizationPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Operators.Views/3.3/HeuristicLabOperatorsViewsPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintCollectionView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/IRealVectorDecoder.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/Properties/Resources.Designer.cs (deleted)
• HeuristicLab.Optimizer/3.3/Properties/Resources.resx (deleted)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SimplifiedSymbolicExpressionModelView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SymbolicExpressionModelView.cs (modified) (1 diff)
• HeuristicLab.Problems.Knapsack/3.3/Analyzers/BestKnapsackSolutionAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.OneMax/3.3/Analyzers/BestOneMaxSolutionAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Interfaces/IRealVectorPSODecoder.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationTypeView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Data.Views {
-  partial class ComparisonView {
+namespace HeuristicLab.Encodings.PermutationEncoding.Views {
+  partial class PermutationTypeView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationTypeView.cs

@@ -26 +26 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Data.Views {
+namespace HeuristicLab.Encodings.PermutationEncoding.Views {
   [View("PermutationType View")]
   [Content(typeof(PermutationType), true)]
-  public partial class ComparisonView : ItemView {
+  public partial class PermutationTypeView : ItemView {
     public new PermutationType Content {
       get { return (PermutationType)base.Content; }
@@ -43 +43 @@
     }
 
-    public ComparisonView() {
+    public PermutationTypeView() {
       InitializeComponent();
       valueComboBox.DataSource = Enum.GetValues(typeof(PermutationTypes));
     }
-    public ComparisonView(PermutationType content)
+    public PermutationTypeView(PermutationType content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj

@@ -90 +90 @@
     <Compile Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="SymbolicExpressionTreeChart.cs">
       <SubType>UserControl</SubType>
@@ -144 +139 @@
     <None Include="Properties\AssemblyInfo.frame" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="GraphicalSymbolicExpressionTreeView.resx">
-      <DependentUpon>GraphicalSymbolicExpressionTreeView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SymbolicExpressionTreeChart.resx">
-      <DependentUpon>SymbolicExpressionTreeChart.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

trunk/sources/HeuristicLab.MainForm/3.3/HeuristicLabMainFormPlugin.cs.frame

@@ -25 +25 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Modeling.Database {
+namespace HeuristicLab.MainForm {
   [Plugin("HeuristicLab.MainForm", "3.3.0.$WCREV$")]
   [PluginFile("HeuristicLab.MainForm-3.3.dll", PluginFileType.Assembly)]

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/HeuristicLabOperatorsViewsGraphVisualizationPlugin.cs.frame

@@ -25 +25 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Operators {
+namespace HeuristicLab.Operators.Views.GraphVisualization {
   /// <summary>
   /// Plugin class for HeuristicLab.Operators.Views plugin.

trunk/sources/HeuristicLab.Operators.Views/3.3/HeuristicLabOperatorsViewsPlugin.cs.frame

@@ -22 +22 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Operators {
+namespace HeuristicLab.Operators.Views {
   /// <summary>
   /// Plugin class for HeuristicLab.Operators.Views plugin.

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintCollectionView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Core.Views {
+namespace HeuristicLab.Optimization.Views {
   partial class RunCollectionConstraintCollectionView {
     /// <summary> 

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintCollectionView.cs

@@ -21 +21 @@
 
 using System;
+using System.Drawing;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
+using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
-using System.Drawing;
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Core.Views {
+namespace HeuristicLab.Optimization.Views {
   [View("ConstraintCollection View")]
   [Content(typeof(RunCollectionConstraintCollection), true)]

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.Designer.cs

@@ -68 +68 @@
       this.runPage = new System.Windows.Forms.TabPage();
       this.constraintPage = new System.Windows.Forms.TabPage();
-      this.runCollectionConstraintCollectionView = new HeuristicLab.Core.Views.RunCollectionConstraintCollectionView();
+      this.runCollectionConstraintCollectionView = new RunCollectionConstraintCollectionView();
       this.clearButton = new System.Windows.Forms.Button();
       this.splitContainer.Panel1.SuspendLayout();
@@ -301 +301 @@
     protected TabPage runPage;
     protected TabPage constraintPage;
-    protected HeuristicLab.Core.Views.RunCollectionConstraintCollectionView runCollectionConstraintCollectionView;
+    protected RunCollectionConstraintCollectionView runCollectionConstraintCollectionView;
     protected Button clearButton;
   }

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IRealVectorDecoder.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 
-namespace HeuristicLab.Optimization.Interfaces {
+namespace HeuristicLab.Optimization {
   public interface IRealVectorDecoder {
     IParameter RealVectorParameter { get; }

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -133 +133 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="ToolBarItems\SaveToolBarItem.cs" />
     <Compile Include="ToolBarItems\OpenToolBarItem.cs" />
@@ -192 +187 @@
   <ItemGroup>
     <EmbeddedResource Include="Documents\GA_TSP.hl" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SimplifiedSymbolicExpressionModelView.cs

@@ -29 +29 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
-using HeuristicLab.Modeling;
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SymbolicExpressionModelView.cs

@@ -29 +29 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
-using HeuristicLab.Modeling;
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis;

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Analyzers/BestKnapsackSolutionAnalyzer.cs

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Knapsack.Analyzers {
+namespace HeuristicLab.Problems.Knapsack {
   /// <summary>
   /// An operator for analyzing the best solution for a knapsack problem.

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Problems.Knapsack.Analyzers;
 
 namespace HeuristicLab.Problems.Knapsack {

trunk/sources/HeuristicLab.Problems.OneMax/3.3/Analyzers/BestOneMaxSolutionAnalyzer.cs

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.OneMax.Analyzers {
+namespace HeuristicLab.Problems.OneMax {
   /// <summary>
   /// An operator for analyzing the best solution for a OneMax problem.

trunk/sources/HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Problems.OneMax.Analyzers;
 
 namespace HeuristicLab.Problems.OneMax {

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.TestFunctions.Analyzers {
+namespace HeuristicLab.Problems.TestFunctions {
   /// <summary>
   /// An operator for analyzing the best solution for a SingleObjectiveTestFunction problem.

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Interfaces/IRealVectorPSODecoder.cs

@@ -26 +26 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization.Interfaces;
 
 namespace HeuristicLab.Problems.TestFunctions {

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -33 +33 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Operators;
-using HeuristicLab.Problems.TestFunctions.Analyzers;
 
 namespace HeuristicLab.Problems.TestFunctions {