- Timestamp:
- 09/17/19 15:41:46 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 12 added
- 2 deleted
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring/HeuristicLab 3.3.sln
r17258 r17260 1 1 2 2 Microsoft Visual Studio Solution File, Format Version 12.00 3 # Visual Studio 154 VisualStudioVersion = 1 5.0.28307.1683 # Visual Studio Version 16 4 VisualStudioVersion = 16.0.29306.81 5 5 MinimumVisualStudioVersion = 10.0.40219.1 6 6 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}" … … 456 456 EndProject 457 457 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis.DecisionTrees-3.4", "HeuristicLab.Algorithms.DataAnalysis.DecisionTrees\3.4\HeuristicLab.Algorithms.DataAnalysis.DecisionTrees-3.4.csproj", "{541A53F3-E6A7-402F-91BB-D76041CDD9FD}" 458 EndProject 459 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.PTSP.Views-3.3", "HeuristicLab.Problems.PTSP.Views\3.3\HeuristicLab.Problems.PTSP.Views-3.3.csproj", "{90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}" 458 460 EndProject 459 461 Global … … 2215 2217 {541A53F3-E6A7-402F-91BB-D76041CDD9FD}.Release|x86.ActiveCfg = Release|Any CPU 2216 2218 {541A53F3-E6A7-402F-91BB-D76041CDD9FD}.Release|x86.Build.0 = Release|Any CPU 2219 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 2220 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|Any CPU.Build.0 = Debug|Any CPU 2221 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x64.ActiveCfg = Debug|x64 2222 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x64.Build.0 = Debug|x64 2223 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x86.ActiveCfg = Debug|x86 2224 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x86.Build.0 = Debug|x86 2225 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|Any CPU.ActiveCfg = Release|Any CPU 2226 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|Any CPU.Build.0 = Release|Any CPU 2227 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x64.ActiveCfg = Release|x64 2228 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x64.Build.0 = Release|x64 2229 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x86.ActiveCfg = Release|x86 2230 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x86.Build.0 = Release|x86 2217 2231 EndGlobalSection 2218 2232 GlobalSection(SolutionProperties) = preSolution -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP.Views/3.3/HeuristicLab.Problems.PTSP.Views-3.3.csproj
r16723 r17260 88 88 <Private>False</Private> 89 89 </ProjectReference> 90 <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj"> 91 <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project> 92 <Name>HeuristicLab.Data.Views-3.3</Name> 93 </ProjectReference> 90 94 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> 91 95 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project> … … 138 142 <Private>False</Private> 139 143 </ProjectReference> 144 <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman.Views\3.3\HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj"> 145 <Project>{cda28124-acd0-4231-8eb0-c510b361f84e}</Project> 146 <Name>HeuristicLab.Problems.TravelingSalesman.Views-3.3</Name> 147 <Private>False</Private> 148 </ProjectReference> 149 <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj"> 150 <Project>{d767c38d-8014-46b0-9a32-03a3aecce34a}</Project> 151 <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name> 152 <Private>False</Private> 153 </ProjectReference> 140 154 <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj"> 141 155 <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project> … … 143 157 <Private>False</Private> 144 158 </ProjectReference> 159 <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 145 160 <Reference Include="System" /> 146 161 <Reference Include="System.Core" /> … … 154 169 </ItemGroup> 155 170 <ItemGroup> 156 <Compile Include="PathPTSPTourView.cs"> 157 <SubType>UserControl</SubType> 158 </Compile> 159 <Compile Include="PathPTSPTourView.Designer.cs"> 160 <DependentUpon>PathPTSPTourView.cs</DependentUpon> 171 <Compile Include="CoordinatesPTSPDataView.cs"> 172 <SubType>UserControl</SubType> 173 </Compile> 174 <Compile Include="CoordinatesPTSPDataView.Designer.cs"> 175 <DependentUpon>CoordinatesPTSPDataView.cs</DependentUpon> 176 </Compile> 177 <Compile Include="EuclideanPTSPDataView.cs"> 178 <SubType>UserControl</SubType> 179 </Compile> 180 <Compile Include="EuclideanPTSPDataView.Designer.cs"> 181 <DependentUpon>EuclideanPTSPDataView.cs</DependentUpon> 182 </Compile> 183 <Compile Include="MatrixPTSPDataView.cs"> 184 <SubType>UserControl</SubType> 185 </Compile> 186 <Compile Include="MatrixPTSPDataView.Designer.cs"> 187 <DependentUpon>MatrixPTSPDataView.cs</DependentUpon> 188 </Compile> 189 <Compile Include="ProbabilisticTSPSolutionView.cs"> 190 <SubType>UserControl</SubType> 191 </Compile> 192 <Compile Include="ProbabilisticTSPSolutionView.Designer.cs"> 193 <DependentUpon>ProbabilisticTSPSolutionView.cs</DependentUpon> 161 194 </Compile> 162 195 <Compile Include="Plugin.cs" /> 163 196 <Compile Include="Properties\AssemblyInfo.cs" /> 164 <Compile Include="ProbabilisticTravelingSalesmanProblemView.cs">165 <SubType>UserControl</SubType>166 </Compile>167 <Compile Include="ProbabilisticTravelingSalesmanProblemView.Designer.cs">168 <DependentUpon>ProbabilisticTravelingSalesmanProblemView.cs</DependentUpon>169 </Compile>170 197 </ItemGroup> 171 198 <ItemGroup> … … 173 200 <None Include="Plugin.cs.frame" /> 174 201 <None Include="Properties\AssemblyInfo.cs.frame" /> 202 </ItemGroup> 203 <ItemGroup> 204 <EmbeddedResource Include="MatrixPTSPDataView.resx"> 205 <DependentUpon>MatrixPTSPDataView.cs</DependentUpon> 206 </EmbeddedResource> 175 207 </ItemGroup> 176 208 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP.Views/3.3/Plugin.cs.frame
r17226 r17260 36 36 [PluginDependency("HeuristicLab.Parameters", "3.3")] 37 37 [PluginDependency("HeuristicLab.Problems.PTSP", "3.3")] 38 [PluginDependency("HeuristicLab.Problems.TravelingSalesman", "3.3")] 39 [PluginDependency("HeuristicLab.Problems.TravelingSalesman.Views", "3.3")] 38 40 [PluginDependency("HeuristicLab.Random", "3.3")] 39 41 public class HeuristicLabProblemsPTSPViewsPlugin : PluginBase { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs
r17253 r17260 27 27 28 28 namespace HeuristicLab.Problems.PTSP { 29 [Item("Analytical Probabilistic TSP (p -TSP)", "Represents a probabilistic traveling salesman problem where the expected tour length is calculated exactly.")]29 [Item("Analytical Probabilistic TSP (pTSP)", "Represents a probabilistic traveling salesman problem where the expected tour length is calculated exactly.")] 30 30 [Creatable(CreatableAttribute.Categories.CombinatorialProblems)] 31 31 [StorableType("509B6AB5-F4DE-4144-A031-43EEBAD02CA6")] -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs
r17253 r17260 32 32 33 33 namespace HeuristicLab.Problems.PTSP { 34 [Item("Estimated Probabilistic TSP (p -TSP)", "Represents a probabilistic traveling salesman problem where the expected tour length is estimated by averaging over the length of tours on a number of, so called, realizations.")]34 [Item("Estimated Probabilistic TSP (pTSP)", "Represents a probabilistic traveling salesman problem where the expected tour length is estimated by averaging over the length of tours on a number of, so called, realizations.")] 35 35 [Creatable(CreatableAttribute.Categories.CombinatorialProblems)] 36 36 [StorableType("d1b4149b-8ab9-4314-8d96-9ea04a4d5b8b")] … … 136 136 /// </summary> 137 137 /// <param name="tour">The tour between all cities.</param> 138 /// <param name="data">The main parameters of the p -TSP.</param>138 /// <param name="data">The main parameters of the pTSP.</param> 139 139 /// <param name="realizations">How many realizations to achieve.</param> 140 140 /// <param name="seed">The starting seed of generating the realizations.</param> -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj
r17253 r17260 165 165 </ItemGroup> 166 166 <ItemGroup> 167 <Compile Include="PTSPData.cs" /> 167 <Compile Include="ProbabilisticTSPData.cs" /> 168 <Compile Include="ProbabilisticTSPSolution.cs" /> 168 169 <None Include="Properties\AssemblyInfo.cs.frame" /> 169 170 <None Include="Plugin.cs.frame" /> … … 195 196 <Compile Include="Moves\TwoPointFiveOpt\TwoPointFiveMoveMaker.cs" /> 196 197 <Compile Include="Moves\TwoPointFiveOpt\TwoPointFiveMove.cs" /> 197 <Compile Include="P TSP.cs" />198 <Compile Include="ProbabilisticTSP.cs" /> 198 199 <Compile Include="Plugin.cs" /> 199 200 <Compile Include="Properties\AssemblyInfo.cs" /> -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalInsertionLocalImprovement.cs
r17253 r17260 38 38 /// The operator tries to improve the probabilistic traveling salesman solution by inserting a city in the tour between two other cities for a certain number of times. 39 39 /// </remarks> 40 [Item(" PTSP Analytical Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]40 [Item("pTSP Analytical Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 41 41 [StorableType("5adca9d8-02b2-4937-9f79-a24d8ea8ea19")] 42 42 public sealed class PTSPAnalyticalInsertionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator { … … 86 86 Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value of the assignment.")); 87 87 Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized.")); 88 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the p -TSP."));88 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP.")); 89 89 } 90 90 -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalInversionLocalImprovement.cs
r17253 r17260 38 38 /// The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times. 39 39 /// </remarks> 40 [Item(" PTSP Analytical Inversion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]40 [Item("pTSP Analytical Inversion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 41 41 [StorableType("88147d6a-e843-4f65-8058-421453b5206a")] 42 42 public sealed class PTSPAnalyticalInversionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator { … … 86 86 Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value of the assignment.")); 87 87 Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized.")); 88 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the p -TSP."));88 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP.")); 89 89 } 90 90 -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalTwoPointFiveLocalImprovement.cs
r17253 r17260 38 38 /// The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times. 39 39 /// </remarks> 40 [Item(" PTSP Analytical 2.5 Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]40 [Item("pTSP Analytical 2.5 Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 41 41 [StorableType("6e07195e-0da7-45ea-9385-0c66594127db")] 42 42 public sealed class PTSPAnalyticalTwoPointFiveLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator { … … 86 86 Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value of the assignment.")); 87 87 Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized.")); 88 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the p -TSP."));88 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP.")); 89 89 } 90 90 -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedInsertionLocalImprovement.cs
r17253 r17260 40 40 /// The operator tries to improve the probabilistic traveling salesman solution by inserting a city in the tour between two other cities for a certain number of times. 41 41 /// </remarks> 42 [Item(" PTSP Estimated Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]42 [Item("pTSP Estimated Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 43 43 [StorableType("B2D60579-A97D-4E44-B11C-61CDA6EBEBA7")] 44 44 public sealed class PTSPEstimatedInsertionLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator { … … 92 92 Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value of the assignment.")); 93 93 Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized.")); 94 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the p -TSP."));94 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP.")); 95 95 Parameters.Add(new LookupParameter<ItemList<BoolArray>>("Realizations", "The list of samples drawn from all possible stochastic instances.")); 96 96 } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedInversionLocalImprovement.cs
r17253 r17260 92 92 Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value of the assignment.")); 93 93 Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized.")); 94 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the p -TSP."));94 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP.")); 95 95 Parameters.Add(new LookupParameter<ItemList<BoolArray>>("Realizations", "The list of samples drawn from all possible stochastic instances.")); 96 96 } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedTwoPointFiveLocalImprovement.cs
r17253 r17260 91 91 Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value of the assignment.")); 92 92 Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized.")); 93 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the p -TSP."));93 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP.")); 94 94 Parameters.Add(new LookupParameter<ReadOnlyItemList<BoolArray>>("Realizations", "The list of samples drawn from all possible stochastic instances.")); 95 95 } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/AnalyticalPTSPMoveEvaluator.cs
r17253 r17260 58 58 Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of a TSP solution.")); 59 59 Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The evaluated quality of a move on a TSP solution.")); 60 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the p -TSP."));60 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP.")); 61 61 } 62 62 -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/EstimatedPTSPMoveEvaluator.cs
r17253 r17260 59 59 : base() { 60 60 Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation.")); 61 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the p -TSP."));61 Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP.")); 62 62 Parameters.Add(new LookupParameter<ReadOnlyItemList<BoolArray>>("Realizations", "The list of samples drawn from all possible stochastic instances.")); 63 63 Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of a TSP solution.")); -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/CoordinatesTSPDataView.cs
r17251 r17260 28 28 29 29 namespace HeuristicLab.Problems.TravelingSalesman.Views { 30 [View(" MatrixTSP Data View")]30 [View("Coordinates TSP Data View")] 31 31 [Content(typeof(CoordinatesTSPData), IsDefaultView = true)] 32 32 public partial class CoordinatesTSPDataView : NamedItemView { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/EuclideanTSPDataView.Designer.cs
r17251 r17260 87 87 #endregion 88 88 89 pr ivateSystem.Windows.Forms.ComboBox roundingModeComboBox;90 pr ivateSystem.Windows.Forms.Label roundingModeLabel;89 protected System.Windows.Forms.ComboBox roundingModeComboBox; 90 protected System.Windows.Forms.Label roundingModeLabel; 91 91 } 92 92 } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/MatrixTSPDataView.Designer.cs
r17251 r17260 166 166 #endregion 167 167 168 pr ivateData.Views.StringConvertibleMatrixView distanceMatrixView;169 pr ivateSystem.Windows.Forms.TabControl tabControl;170 pr ivateSystem.Windows.Forms.TabPage coordinatesTabPage;171 pr ivateSystem.Windows.Forms.SplitContainer coordinatesSplitContainer;172 pr ivateData.Views.StringConvertibleMatrixView coordinatesMatrixView;173 pr ivateSystem.Windows.Forms.TabPage distancesTabPage;174 pr ivateSystem.Windows.Forms.PictureBox coordinatesPictureBox;168 protected Data.Views.StringConvertibleMatrixView distanceMatrixView; 169 protected System.Windows.Forms.TabControl tabControl; 170 protected System.Windows.Forms.TabPage coordinatesTabPage; 171 protected System.Windows.Forms.SplitContainer coordinatesSplitContainer; 172 protected Data.Views.StringConvertibleMatrixView coordinatesMatrixView; 173 protected System.Windows.Forms.TabPage distancesTabPage; 174 protected System.Windows.Forms.PictureBox coordinatesPictureBox; 175 175 } 176 176 } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/MatrixTSPDataView.cs
r17251 r17260 60 60 } 61 61 62 pr ivatevoid GenerateImage() {62 protected virtual void GenerateImage() { 63 63 if (coordinatesPictureBox.Width > 0 && coordinatesPictureBox.Height > 0) { 64 64 DoubleMatrix coordinates = Content?.DisplayCoordinates; -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPSolutionView.Designer.cs
r17248 r17260 215 215 #endregion 216 216 217 pr ivateSystem.Windows.Forms.PictureBox pictureBox;218 pr ivateHeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl;219 pr ivateSystem.Windows.Forms.TabPage visualizationTabPage;220 pr ivateSystem.Windows.Forms.TabPage valueTabPage;221 pr ivateSystem.Windows.Forms.GroupBox tourGroupBox;222 pr ivateHeuristicLab.MainForm.WindowsForms.ViewHost tourViewHost;223 pr ivateSystem.Windows.Forms.SplitContainer splitContainer;224 pr ivateSystem.Windows.Forms.GroupBox qualityGroupBox;225 pr ivateHeuristicLab.MainForm.WindowsForms.ViewHost qualityViewHost;217 protected System.Windows.Forms.PictureBox pictureBox; 218 protected HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl; 219 protected System.Windows.Forms.TabPage visualizationTabPage; 220 protected System.Windows.Forms.TabPage valueTabPage; 221 protected System.Windows.Forms.GroupBox tourGroupBox; 222 protected HeuristicLab.MainForm.WindowsForms.ViewHost tourViewHost; 223 protected System.Windows.Forms.SplitContainer splitContainer; 224 protected System.Windows.Forms.GroupBox qualityGroupBox; 225 protected HeuristicLab.MainForm.WindowsForms.ViewHost qualityViewHost; 226 226 227 227 -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPSolutionView.cs
r17248 r17260 34 34 /// </summary> 35 35 [View("TSP Solution View")] 36 [Content(typeof( TSPSolution), true)]37 public sealedpartial class TSPSolutionView : ItemView {38 public new TSPSolution Content {39 get { return ( TSPSolution)base.Content; }36 [Content(typeof(ITSPSolution), true)] 37 public partial class TSPSolutionView : ItemView { 38 public new ITSPSolution Content { 39 get { return (ITSPSolution)base.Content; } 40 40 set { base.Content = value; } 41 41 } … … 77 77 } 78 78 79 pr ivatevoid GenerateImage() {79 protected virtual void GenerateImage() { 80 80 if ((pictureBox.Width > 0) && (pictureBox.Height > 0)) { 81 81 if (Content == null) { … … 130 130 } 131 131 132 pr ivatevoid ContentOnPropertyChanged(object sender, PropertyChangedEventArgs e) {132 protected virtual void ContentOnPropertyChanged(object sender, PropertyChangedEventArgs e) { 133 133 if (InvokeRequired) 134 134 Invoke((Action<object, PropertyChangedEventArgs>)ContentOnPropertyChanged, sender, e); -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TSPSolution.cs
r17248 r17260 30 30 namespace HeuristicLab.Problems.TravelingSalesman { 31 31 [StorableType("f08a63d9-0b83-4944-9251-42925baeb872")] 32 public interface ITSPSolution : IItem {32 public interface ITSPSolution : IItem, INotifyPropertyChanged { 33 33 DoubleMatrix Coordinates { get; } 34 34 Permutation Tour { get; } … … 41 41 [Item("TSP Solution", "Represents a tour of a Traveling Salesman Problem given in path representation which can be visualized in the GUI.")] 42 42 [StorableType("38d1aac3-3047-40d9-bcf9-4b3ca0b9f95c")] 43 public sealed class TSPSolution : Item, ITSPSolution, INotifyPropertyChanged{43 public class TSPSolution : Item, ITSPSolution { 44 44 public static new Image StaticItemImage { 45 45 get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; } … … 79 79 80 80 [StorableConstructor] 81 pr ivateTSPSolution(StorableConstructorFlag _) : base(_) { }82 pr ivateTSPSolution(TSPSolution original, Cloner cloner)81 protected TSPSolution(StorableConstructorFlag _) : base(_) { } 82 protected TSPSolution(TSPSolution original, Cloner cloner) 83 83 : base(original, cloner) { 84 84 this.coordinates = cloner.Clone(original.coordinates); … … 108 108 109 109 public event PropertyChangedEventHandler PropertyChanged; 110 pr ivatevoid OnPropertyChanged(string property) {110 protected void OnPropertyChanged(string property) { 111 111 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property)); 112 112 } -
branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/StorableTest.cs
r17226 r17260 27 27 using HEAL.Attic; 28 28 using HeuristicLab.Common; 29 using HeuristicLab.MainForm; 29 30 using HeuristicLab.PluginInfrastructure; 30 31 using Microsoft.VisualStudio.TestTools.UnitTesting; … … 94 95 Assert.IsTrue(errorMessage.Length == 0, errorMessage.ToString()); 95 96 } 97 98 [TestMethod] 99 [TestCategory("General")] 100 [TestCategory("Essential")] 101 [TestProperty("Time", "short")] 102 public void TestStorableTypeAttributePresence() { 103 var errorMessage = new StringBuilder(); 104 foreach (Assembly ass in AppDomain.CurrentDomain.GetAssemblies().Where(x => x.GetName().Name.StartsWith("HeuristicLab"))) { 105 if (ass == Assembly.GetExecutingAssembly()) continue; 106 foreach (Type t in ass.GetExportedTypes()) { 107 if (t.IsAbstract && t.IsSealed) continue; // static classes are abstract and sealed at IL level 108 if (t.Namespace != null && (t.Namespace.EndsWith(".Views") 109 || t.Namespace.StartsWith("ICSharpCode") 110 || t.Namespace.StartsWith("HeuristicLab.Problems.Instances") 111 || t.Namespace.StartsWith("HeuristicLab.PluginInfrastructure") 112 || t.Namespace.StartsWith("HeuristicLab.Persistence") 113 || t.Namespace.StartsWith("HeuristicLab.MainForm") 114 || t.Namespace.StartsWith("HeuristicLab.Clients") 115 || t.Namespace.StartsWith("HeuristicLab.CodeEditor"))) 116 continue; 117 if (typeof(IPlugin).IsAssignableFrom(t) || typeof(Attribute).IsAssignableFrom(t) || typeof(Exception).IsAssignableFrom(t) 118 || typeof(EventArgs).IsAssignableFrom(t) 119 || typeof(IView).IsAssignableFrom(t) || typeof(System.Windows.Forms.Control).IsAssignableFrom(t)) continue; 120 var attr = StorableTypeAttribute.GetStorableTypeAttribute(t); 121 if (attr == null) { 122 errorMessage.AppendLine(t.FullName + ": Does not contain a storable type attribute."); 123 } 124 } 125 } 126 Assert.IsTrue(errorMessage.Length == 0, errorMessage.ToString()); 127 } 96 128 } 97 129 }
Note: See TracChangeset
for help on using the changeset viewer.