Changeset 3373
- Timestamp:
- 04/16/10 15:22:57 (14 years ago)
- Location:
- trunk/sources
- Files:
-
- 8 added
- 9 deleted
- 14 edited
- 1 copied
- 8 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab 3.3.sln
r3363 r3373 55 55 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD} = {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD} 56 56 {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} = {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} 57 {799B0B38-E384-4A17-A73C-F211EB854592} = {799B0B38-E384-4A17-A73C-F211EB854592} 57 58 {678E2145-8152-4E19-9646-07D439D00301} = {678E2145-8152-4E19-9646-07D439D00301} 58 59 {BB994448-2B21-4564-BB2E-38D8FFF8CF18} = {BB994448-2B21-4564-BB2E-38D8FFF8CF18} … … 241 242 EndProject 242 243 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3", "HeuristicLab.Algorithms.ParticleSwarmOptimization\3.3\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj", "{2C429157-9C34-4DD3-9D5F-B444B751E39A}" 244 EndProject 245 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Views-3.3", "HeuristicLab.Problems.DataAnalysis.Views\3.3\HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj", "{799B0B38-E384-4A17-A73C-F211EB854592}" 243 246 EndProject 244 247 Global … … 1226 1229 {125D3006-67F5-48CB-913E-73C0548F17FA}.Release|x86.Build.0 = Release|x86 1227 1230 {125D3006-67F5-48CB-913E-73C0548F17FA}.Services|Any CPU.ActiveCfg = Release|Any CPU 1228 {125D3006-67F5-48CB-913E-73C0548F17FA}.Services|x64.ActiveCfg = Release|x 861231 {125D3006-67F5-48CB-913E-73C0548F17FA}.Services|x64.ActiveCfg = Release|x64 1229 1232 {125D3006-67F5-48CB-913E-73C0548F17FA}.Services|x86.ActiveCfg = Release|x86 1230 1233 {F5C0ECAC-EDBA-4024-872A-1F74AFCB20B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU … … 1305 1308 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1306 1309 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|Any CPU.Build.0 = Debug|Any CPU 1307 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x64.ActiveCfg = Debug|Any CPU 1308 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x86.ActiveCfg = Debug|Any CPU 1310 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x64.ActiveCfg = Debug|x64 1311 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x64.Build.0 = Debug|x64 1312 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x86.ActiveCfg = Debug|x86 1313 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x86.Build.0 = Debug|x86 1309 1314 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|Any CPU.ActiveCfg = Release|Any CPU 1310 1315 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|Any CPU.Build.0 = Release|Any CPU 1311 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x64.ActiveCfg = Release|Any CPU 1312 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.ActiveCfg = Release|Any CPU 1316 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x64.ActiveCfg = Release|x64 1317 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x64.Build.0 = Release|x64 1318 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.ActiveCfg = Release|x86 1319 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.Build.0 = Release|x86 1313 1320 {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|Any CPU.ActiveCfg = Release|Any CPU 1314 {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|Any CPU.Build.0 = Release|Any CPU 1315 {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|x64.ActiveCfg = Release|Any CPU 1316 {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|x86.ActiveCfg = Release|Any CPU 1321 {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|x64.ActiveCfg = Release|x64 1322 {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|x86.ActiveCfg = Release|x86 1317 1323 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1318 1324 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 1323 1329 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|Any CPU.ActiveCfg = Release|Any CPU 1324 1330 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|Any CPU.Build.0 = Release|Any CPU 1325 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x64.ActiveCfg = Release|Any CPU 1326 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x86.ActiveCfg = Release|Any CPU 1331 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x64.ActiveCfg = Release|x64 1332 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x64.Build.0 = Release|x64 1333 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x86.ActiveCfg = Release|x86 1334 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x86.Build.0 = Release|x86 1327 1335 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|Any CPU.ActiveCfg = Release|Any CPU 1328 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|Any CPU.Build.0 = Release|Any CPU 1329 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|x64.ActiveCfg = Release|Any CPU 1330 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|x86.ActiveCfg = Release|Any CPU 1336 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|x64.ActiveCfg = Release|x64 1337 {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|x86.ActiveCfg = Release|x86 1331 1338 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1332 1339 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 1341 1348 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x86.ActiveCfg = Release|x86 1342 1349 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x86.Build.0 = Release|x86 1343 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|Any CPU.ActiveCfg = Release| x641350 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|Any CPU.ActiveCfg = Release|Any CPU 1344 1351 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x64.ActiveCfg = Release|x64 1345 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x64.Build.0 = Release|x64 1346 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x86.ActiveCfg = Release|x64 1352 {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x86.ActiveCfg = Release|x86 1353 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1354 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.Build.0 = Debug|Any CPU 1355 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x64.ActiveCfg = Debug|x64 1356 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x64.Build.0 = Debug|x64 1357 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x86.ActiveCfg = Debug|x86 1358 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x86.Build.0 = Debug|x86 1359 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|Any CPU.ActiveCfg = Release|Any CPU 1360 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|Any CPU.Build.0 = Release|Any CPU 1361 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x64.ActiveCfg = Release|x64 1362 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x64.Build.0 = Release|x64 1363 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x86.ActiveCfg = Release|x86 1364 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x86.Build.0 = Release|x86 1365 {799B0B38-E384-4A17-A73C-F211EB854592}.Services|Any CPU.ActiveCfg = Release|Any CPU 1366 {799B0B38-E384-4A17-A73C-F211EB854592}.Services|x64.ActiveCfg = Release|x64 1367 {799B0B38-E384-4A17-A73C-F211EB854592}.Services|x86.ActiveCfg = Release|x86 1347 1368 EndGlobalSection 1348 1369 GlobalSection(SolutionProperties) = preSolution -
trunk/sources/HeuristicLab 3.3/Files.txt
r3363 r3373 46 46 HeuristicLab.Problems.DataAnalysis\3.3:HeuristicLab.Problems.DataAnalysis-3.3.dll 47 47 HeuristicLab.Problems.DataAnalysis.Regression\3.3:HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll 48 HeuristicLab.Problems.DataAnalysis.Views\3.3:HeuristicLab.Problems.DataAnalysis.Views-3.3.dll 48 49 HeuristicLab.Problems.Knapsack\3.3:HeuristicLab.Problems.Knapsack-3.3.dll 49 50 HeuristicLab.Problems.Knapsack.Views\3.3:HeuristicLab.Problems.Knapsack.Views-3.3.dll -
trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.Tests.csproj
r3368 r3373 30 30 <ErrorReport>prompt</ErrorReport> 31 31 <WarningLevel>4</WarningLevel> 32 </PropertyGroup> 33 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> 34 <DebugSymbols>true</DebugSymbols> 35 <OutputPath>bin\x64\Debug\</OutputPath> 36 <DefineConstants>DEBUG;TRACE</DefineConstants> 37 <DebugType>full</DebugType> 38 <PlatformTarget>x64</PlatformTarget> 39 <ErrorReport>prompt</ErrorReport> 40 </PropertyGroup> 41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> 42 <OutputPath>bin\x64\Release\</OutputPath> 43 <DefineConstants>TRACE</DefineConstants> 44 <Optimize>true</Optimize> 45 <DebugType>pdbonly</DebugType> 46 <PlatformTarget>x64</PlatformTarget> 47 <ErrorReport>prompt</ErrorReport> 48 </PropertyGroup> 49 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 50 <DebugSymbols>true</DebugSymbols> 51 <OutputPath>bin\x86\Debug\</OutputPath> 52 <DefineConstants>DEBUG;TRACE</DefineConstants> 53 <DebugType>full</DebugType> 54 <PlatformTarget>x86</PlatformTarget> 55 <ErrorReport>prompt</ErrorReport> 56 </PropertyGroup> 57 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 58 <OutputPath>bin\x86\Release\</OutputPath> 59 <DefineConstants>TRACE</DefineConstants> 60 <Optimize>true</Optimize> 61 <DebugType>pdbonly</DebugType> 62 <PlatformTarget>x86</PlatformTarget> 63 <ErrorReport>prompt</ErrorReport> 32 64 </PropertyGroup> 33 65 <ItemGroup> -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj
r3368 r3373 71 71 </Reference> 72 72 <Reference Include="System.Drawing" /> 73 <Reference Include="System.Windows.Forms" />74 73 <Reference Include="System.Xml.Linq"> 75 74 <RequiredTargetFramework>3.5</RequiredTargetFramework> … … 85 84 <None Include="HeuristicLabProblemsDataAnalysisRegressionPlugin.cs.frame" /> 86 85 <None Include="Properties\AssemblyInfo.frame" /> 87 <Compile Include="RegressionProblemDataView.cs">88 <SubType>UserControl</SubType>89 </Compile>90 <Compile Include="RegressionProblemDataView.Designer.cs">91 <DependentUpon>RegressionProblemDataView.cs</DependentUpon>92 </Compile>93 <Compile Include="RegressionProblemData.cs" />94 <Compile Include="CsvFileParser.cs" />95 <Compile Include="DataFormatException.cs" />96 <Compile Include="Symbolic\ArithmeticExpressionGrammar.cs" />97 <Compile Include="Symbolic\SimpleArithmeticExpressionEvaluator.cs" />98 <Compile Include="Symbolic\SymbolicRegressionMeanSquaredErrorEvaluator.cs" />99 <Compile Include="Symbolic\SymbolicRegressionEvaluator.cs" />100 <Compile Include="Symbolic\ISymbolicRegressionEvaluator.cs" />101 <Compile Include="Symbolic\SymbolicRegressionProblem.cs" />102 <Compile Include="RegressionProblem.cs" />103 86 <Compile Include="HeuristicLabProblemsDataAnalysisRegressionPlugin.cs" /> 104 87 <Compile Include="Properties\AssemblyInfo.cs" /> 105 <Compile Include="Symbolic\Symbols\Constant.cs" /> 106 <Compile Include="Symbolic\Symbols\ConstantTreeNode.cs" /> 107 <Compile Include="Symbolic\Symbols\Variable.cs" /> 108 <Compile Include="Symbolic\Symbols\VariableTreeNode.cs" /> 88 <Compile Include="Symbolic\ISymbolicRegressionEvaluator.cs"> 89 <SubType>Code</SubType> 90 </Compile> 91 <Compile Include="Symbolic\SymbolicRegressionEvaluator.cs"> 92 <SubType>Code</SubType> 93 </Compile> 94 <Compile Include="Symbolic\SymbolicRegressionMeanSquaredErrorEvaluator.cs"> 95 <SubType>Code</SubType> 96 </Compile> 97 <Compile Include="Symbolic\SymbolicRegressionProblem.cs"> 98 <SubType>Code</SubType> 99 </Compile> 109 100 </ItemGroup> 110 101 <ItemGroup> … … 121 112 <Name>HeuristicLab.Common-3.2</Name> 122 113 </ProjectReference> 123 <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">124 <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>125 <Name>HeuristicLab.Core.Views-3.3</Name>126 </ProjectReference>127 114 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj"> 128 115 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project> 129 116 <Name>HeuristicLab.Core-3.3</Name> 130 </ProjectReference>131 <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">132 <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>133 <Name>HeuristicLab.Data.Views-3.3</Name>134 117 </ProjectReference> 135 118 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> … … 141 124 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name> 142 125 </ProjectReference> 143 <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">144 <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>145 <Name>HeuristicLab.MainForm.WindowsForms-3.2</Name>146 </ProjectReference>147 <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">148 <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>149 <Name>HeuristicLab.MainForm-3.2</Name>150 </ProjectReference>151 126 <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj"> 152 127 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project> 153 128 <Name>HeuristicLab.Operators-3.3</Name> 154 129 </ProjectReference> 155 <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">156 <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>157 <Name>HeuristicLab.Optimization.Views-3.3</Name>158 </ProjectReference>159 130 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> 160 131 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> 161 132 <Name>HeuristicLab.Optimization-3.3</Name> 162 </ProjectReference>163 <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">164 <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project>165 <Name>HeuristicLab.Parameters.Views-3.3</Name>166 133 </ProjectReference> 167 134 <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj"> -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/ISymbolicRegressionEvaluator.cs
r3294 r3373 37 37 public interface ISymbolicRegressionEvaluator : ISingleObjectiveEvaluator { 38 38 ILookupParameter<SymbolicExpressionTree> FunctionTreeParameter { get; } 39 ILookupParameter< RegressionProblemData> RegressionProblemDataParameter { get; }39 ILookupParameter<DataAnalysisProblemData> RegressionProblemDataParameter { get; } 40 40 ILookupParameter<DoubleValue> NumberOfEvaluatedNodesParameter { get; } 41 41 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs
r3294 r3373 33 33 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 34 34 using HeuristicLab.Problems.DataAnalysis.Regression; 35 using HeuristicLab.Problems.DataAnalysis.Symbolic; 35 36 36 37 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic { … … 38 39 [Creatable("Problems")] 39 40 [StorableClass] 40 public sealed class SymbolicRegressionProblem : RegressionProblem, ISingleObjectiveProblem {41 public sealed class SymbolicRegressionProblem : DataAnalysisProblem, ISingleObjectiveProblem { 41 42 42 43 #region Parameter Properties … … 155 156 creator.SymbolicExpressionTreeParameter.ActualName = "SymbolicRegressionModel"; 156 157 evaluator.QualityParameter.ActualName = "TrainingMeanSquaredError"; 157 RegressionProblemDataParameter.ValueChanged += new EventHandler(RegressionProblemDataParameter_ValueChanged);158 RegressionProblemData.InputVariablesChanged += new EventHandler(RegressionProblemData_InputVariablesChanged);158 DataAnalysisProblemDataParameter.ValueChanged += new EventHandler(DataAnalysisProblemDataParameter_ValueChanged); 159 DataAnalysisProblemData.InputVariablesChanged += new EventHandler(DataAnalysisProblemData_InputVariablesChanged); 159 160 ParameterizeSolutionCreator(); 160 161 ParameterizeEvaluator(); … … 164 165 } 165 166 166 void RegressionProblemDataParameter_ValueChanged(object sender, EventArgs e) {167 RegressionProblemData.InputVariablesChanged += new EventHandler(RegressionProblemData_InputVariablesChanged);168 } 169 170 void RegressionProblemData_InputVariablesChanged(object sender, EventArgs e) {171 FunctionTreeGrammar.VariableNames = RegressionProblemData.InputVariables.Select(x => x.Value);167 void DataAnalysisProblemDataParameter_ValueChanged(object sender, EventArgs e) { 168 DataAnalysisProblemData.InputVariablesChanged += new EventHandler(DataAnalysisProblemData_InputVariablesChanged); 169 } 170 171 void DataAnalysisProblemData_InputVariablesChanged(object sender, EventArgs e) { 172 FunctionTreeGrammar.VariableNames = DataAnalysisProblemData.InputVariables.Select(x => x.Value); 172 173 } 173 174 … … 263 264 private void ParameterizeEvaluator() { 264 265 Evaluator.FunctionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName; 265 Evaluator.RegressionProblemDataParameter.ActualName = RegressionProblemDataParameter.Name;266 Evaluator.RegressionProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name; 266 267 } 267 268 private void ParameterizeVisualizer() { … … 289 290 foreach (ISymbolicRegressionEvaluator op in Operators.OfType<ISymbolicRegressionEvaluator>()) { 290 291 op.FunctionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName; 291 op.RegressionProblemDataParameter.ActualName = RegressionProblemDataParameter.Name;292 op.RegressionProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name; 292 293 op.NumberOfEvaluatedNodesParameter.ActualName = NumberOfEvaluatedNodesParameter.Name; 293 294 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.Designer.cs
r3368 r3373 20 20 #endregion 21 21 22 namespace HeuristicLab.Problems.DataAnalysis .Regression{23 partial class RegressionProblemDataView {22 namespace HeuristicLab.Problems.DataAnalysis { 23 partial class DataAnalysisProblemDataView { 24 24 /// <summary> 25 25 /// Required designer variable. -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.cs
r3368 r3373 26 26 using HeuristicLab.MainForm; 27 27 28 namespace HeuristicLab.Problems.DataAnalysis .Regression{29 [View(" Regression ProblemData View")]30 [Content(typeof( RegressionProblemData), true)]31 public partial class RegressionProblemDataView : NamedItemView {28 namespace HeuristicLab.Problems.DataAnalysis { 29 [View("Data-Analysis Data View")] 30 [Content(typeof(DataAnalysisProblemData), true)] 31 public partial class DataAnalysisProblemDataView : NamedItemView { 32 32 private OpenFileDialog openFileDialog; 33 33 34 public new RegressionProblemData Content {35 get { return ( RegressionProblemData)base.Content; }34 public new DataAnalysisProblemData Content { 35 get { return (DataAnalysisProblemData)base.Content; } 36 36 set { base.Content = value; } 37 37 } 38 38 39 public RegressionProblemDataView() {39 public DataAnalysisProblemDataView() { 40 40 InitializeComponent(); 41 41 } 42 42 43 public RegressionProblemDataView(RegressionProblemData content)43 public DataAnalysisProblemDataView(DataAnalysisProblemData content) 44 44 : this() { 45 45 Content = content; … … 67 67 importButton.Enabled = false; 68 68 } else { 69 //parameterCollectionView.Content = ((IParameterizedNamedItem)Content).Parameters;70 //parameterCollectionView.Enabled = true;71 69 importButton.Enabled = true; 72 70 this.datasetView.Content = this.Content.Dataset; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemView.Designer.cs
r3368 r3373 20 20 #endregion 21 21 22 namespace HeuristicLab.Problems.DataAnalysis .Regression{23 partial class RegressionProblemView {22 namespace HeuristicLab.Problems.DataAnalysis { 23 partial class DataAnalysisProblemView { 24 24 /// <summary> 25 25 /// Required designer variable. … … 33 33 protected override void Dispose(bool disposing) { 34 34 if (disposing) { 35 if (openFileDialog != null) openFileDialog.Dispose();36 35 if (components != null) components.Dispose(); 37 36 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemView.cs
r3368 r3373 26 26 using HeuristicLab.MainForm; 27 27 28 namespace HeuristicLab.Problems.DataAnalysis.Regression { 29 [View("Regression Problem View")] 30 [Content(typeof(RegressionProblem), true)] 31 public partial class RegressionProblemView : NamedItemView { 32 private OpenFileDialog openFileDialog; 33 34 public new RegressionProblem Content { 35 get { return (RegressionProblem)base.Content; } 28 namespace HeuristicLab.Problems.DataAnalysis { 29 [View("Data-Analysis Problem View")] 30 [Content(typeof(DataAnalysisProblem), true)] 31 public partial class DataAnalysisProblemView : NamedItemView { 32 public new DataAnalysisProblem Content { 33 get { return (DataAnalysisProblem)base.Content; } 36 34 set { base.Content = value; } 37 35 } 38 36 39 public RegressionProblemView() {37 public DataAnalysisProblemView() { 40 38 InitializeComponent(); 41 39 } 42 40 43 public RegressionProblemView(RegressionProblem content)41 public DataAnalysisProblemView(DataAnalysisProblem content) 44 42 : this() { 45 43 Content = content; … … 58 56 } 59 57 } 60 61 private void importButton_Click(object sender, System.EventArgs e) {62 if (openFileDialog == null) openFileDialog = new OpenFileDialog();63 64 if (openFileDialog.ShowDialog(this) == DialogResult.OK) {65 try {66 Content.ImportFromFile(openFileDialog.FileName);67 }68 catch (Exception ex) {69 Auxiliary.ShowErrorMessageBox(ex);70 }71 }72 }73 58 } 74 59 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/CsvFileParser.cs
r3368 r3373 28 28 using System.Text; 29 29 30 namespace HeuristicLab.Problems.DataAnalysis .Regression{30 namespace HeuristicLab.Problems.DataAnalysis { 31 31 public class CsvFileParser { 32 32 private const string VARIABLENAMES = "VARIABLENAMES"; -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblem.cs
r3368 r3373 27 27 using HeuristicLab.Parameters; 28 28 using HeuristicLab.Data; 29 using HeuristicLab.Optimization;30 29 using HeuristicLab.Problems.DataAnalysis; 31 30 using System.Drawing; 32 31 using System.IO; 33 32 34 namespace HeuristicLab.Problems.DataAnalysis .Regression{35 [Item(" RegressionProblem", "Represents a regressionproblem.")]33 namespace HeuristicLab.Problems.DataAnalysis { 34 [Item("DataAnalysisProblem", "Represents a data analysis problem.")] 36 35 [Creatable("Problems")] 37 36 [StorableClass] 38 public class RegressionProblem : ParameterizedNamedItem {39 private const string RegressionProblemDataParameterName = "RegressionProblemData";37 public class DataAnalysisProblem : ParameterizedNamedItem { 38 private const string DataAnalysisProblemDataParameterName = "DataAnalysisProblemData"; 40 39 public override Image ItemImage { 41 40 get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; } … … 43 42 44 43 #region Parameter Properties 45 public ValueParameter< RegressionProblemData> RegressionProblemDataParameter {46 get { return (ValueParameter< RegressionProblemData>)Parameters[RegressionProblemDataParameterName]; }44 public ValueParameter<DataAnalysisProblemData> DataAnalysisProblemDataParameter { 45 get { return (ValueParameter<DataAnalysisProblemData>)Parameters[DataAnalysisProblemDataParameterName]; } 47 46 } 48 47 #endregion 49 48 #region properties 50 public RegressionProblemData RegressionProblemData {51 get { return RegressionProblemDataParameter.Value; }52 set { RegressionProblemDataParameter.Value = value; }49 public DataAnalysisProblemData DataAnalysisProblemData { 50 get { return DataAnalysisProblemDataParameter.Value; } 51 set { DataAnalysisProblemDataParameter.Value = value; } 53 52 } 54 53 #endregion 55 54 56 public RegressionProblem()55 public DataAnalysisProblem() 57 56 : base() { 58 Parameters.Add(new ValueParameter< RegressionProblemData>(RegressionProblemDataParameterName, "The data set, target variable and input variables of the regression problem.", new RegressionProblemData()));57 Parameters.Add(new ValueParameter<DataAnalysisProblemData>(DataAnalysisProblemDataParameterName, "The data set, target variable and input variables of the data analysis problem.", new DataAnalysisProblemData())); 59 58 } 60 59 61 60 [StorableConstructor] 62 private RegressionProblem(bool deserializing) : base() { }61 private DataAnalysisProblem(bool deserializing) : base() { } 63 62 } 64 63 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblemData.cs
r3368 r3373 27 27 using HeuristicLab.Parameters; 28 28 using HeuristicLab.Data; 29 using HeuristicLab.Optimization;30 29 using HeuristicLab.Problems.DataAnalysis; 31 30 using System.Drawing; 32 31 using System.IO; 33 32 34 namespace HeuristicLab.Problems.DataAnalysis .Regression{35 [Item(" RegressionProblemData", "Represents an item containing all data defining a regressionproblem.")]33 namespace HeuristicLab.Problems.DataAnalysis { 34 [Item("DataAnalysisProblemData", "Represents an item containing all data defining a data analysis problem.")] 36 35 [StorableClass] 37 public class RegressionProblemData : NamedItem {36 public class DataAnalysisProblemData : NamedItem { 38 37 #region properties 39 38 private Dataset dataset; … … 109 108 #endregion 110 109 111 public RegressionProblemData()110 public DataAnalysisProblemData() 112 111 : base() { 113 112 dataset = new Dataset(); … … 123 122 124 123 [StorableConstructor] 125 private RegressionProblemData(bool deserializing) : base() { }124 private DataAnalysisProblemData(bool deserializing) : base() { } 126 125 127 126 #region events … … 142 141 var csvFileParser = new CsvFileParser(); 143 142 csvFileParser.Parse(fileName); 144 Name = " Regression Problem (imported from " + Path.GetFileName(fileName) + ")";143 Name = "Data imported from " + Path.GetFileName(fileName); 145 144 Dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values); 146 145 Dataset.Name = Path.GetFileName(fileName); -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataFormatException.cs
r3368 r3373 25 25 using System.Text; 26 26 27 namespace HeuristicLab.Problems.DataAnalysis .Regression{27 namespace HeuristicLab.Problems.DataAnalysis { 28 28 public class DataFormatException : Exception { 29 29 private int line; -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj
r3257 r3373 70 70 <RequiredTargetFramework>3.5</RequiredTargetFramework> 71 71 </Reference> 72 <Reference Include="System.Drawing" /> 72 73 <Reference Include="System.Xml.Linq"> 73 74 <RequiredTargetFramework>3.5</RequiredTargetFramework> … … 83 84 <None Include="HeuristicLabProblemsDataAnalysisPlugin.cs.frame" /> 84 85 <None Include="Properties\AssemblyInfo.frame" /> 86 <Compile Include="CsvFileParser.cs" /> 87 <Compile Include="DataAnalysisProblem.cs" /> 88 <Compile Include="DataAnalysisProblemData.cs" /> 89 <Compile Include="DataFormatException.cs" /> 85 90 <Compile Include="Dataset.cs" /> 86 91 <Compile Include="Evaluators\SimpleEvaluator.cs" /> … … 89 94 <Compile Include="MatrixExtensions.cs" /> 90 95 <Compile Include="Properties\AssemblyInfo.cs" /> 96 <Compile Include="Symbolic\ArithmeticExpressionGrammar.cs" /> 97 <Compile Include="Symbolic\SimpleArithmeticExpressionEvaluator.cs" /> 98 <Compile Include="Symbolic\Symbols\Constant.cs" /> 99 <Compile Include="Symbolic\Symbols\ConstantTreeNode.cs" /> 100 <Compile Include="Symbolic\Symbols\Variable.cs" /> 101 <Compile Include="Symbolic\Symbols\VariableTreeNode.cs" /> 91 102 </ItemGroup> 92 103 <ItemGroup> … … 94 105 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> 95 106 <Name>HeuristicLab.Collections-3.3</Name> 107 </ProjectReference> 108 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj"> 109 <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project> 110 <Name>HeuristicLab.Common.Resources-3.2</Name> 96 111 </ProjectReference> 97 112 <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj"> … … 127 142 <Name>HeuristicLab.PluginInfrastructure</Name> 128 143 </ProjectReference> 144 <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj"> 145 <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project> 146 <Name>HeuristicLab.Random-3.3</Name> 147 </ProjectReference> 129 148 </ItemGroup> 130 149 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/ArithmeticExpressionGrammar.cs
r3338 r3373 20 20 #endregion 21 21 22 23 22 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 24 23 using System.Collections.Generic; … … 28 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 28 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols; 30 using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols;31 29 using HeuristicLab.Data; 32 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic { 30 using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols; 31 namespace HeuristicLab.Problems.DataAnalysis.Symbolic { 33 32 [StorableClass] 34 33 [Item("ArithmeticExpressionGrammar", "Represents a grammar for functional expressions using only arithmetic operations.")] … … 45 44 46 45 [Storable] 47 private HeuristicLab.Problems.DataAnalysis. Regression.Symbolic.Symbols.Variable variableSymbol;46 private HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable variableSymbol; 48 47 49 48 public ArithmeticExpressionGrammar() … … 58 57 var div = new Division(); 59 58 var constant = new Constant(); 60 variableSymbol = new HeuristicLab.Problems.DataAnalysis. Regression.Symbolic.Symbols.Variable();59 variableSymbol = new HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable(); 61 60 62 61 var allSymbols = new List<Symbol>() { add, sub, mul, div, constant, variableSymbol }; 63 62 var functionSymbols = new List<Symbol>() { add, sub, mul, div }; 63 64 64 foreach (var symb in allSymbols) 65 65 AddSymbol(symb); -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionEvaluator.cs
r3294 r3373 27 27 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 28 28 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols; 29 using HeuristicLab.Problems.DataAnalysis. Regression.Symbolic.Symbols;29 using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols; 30 30 31 namespace HeuristicLab.Problems.DataAnalysis. Regression.Symbolic {31 namespace HeuristicLab.Problems.DataAnalysis.Symbolic { 32 32 [StorableClass] 33 33 [Item("SimpleArithmeticExpressionEvaluator", "Default evaluator for arithmetic symbolic expression trees.")] … … 82 82 } 83 83 case CodeSymbol.Dynamic: { 84 if (currentInstr.dynamicNode is VariableTreeNode) {85 var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;84 var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode; 85 if (variableTreeNode != null) { 86 86 return dataset[row, dataset.GetVariableIndex(variableTreeNode.VariableName)] * variableTreeNode.Weight; 87 } else if (currentInstr.dynamicNode is ConstantTreeNode) { 88 return ((ConstantTreeNode)currentInstr.dynamicNode).Value; 87 } 88 var constTreeNode = currentInstr.dynamicNode as ConstantTreeNode; 89 if (constTreeNode != null) { 90 return constTreeNode.Value; 89 91 } else throw new NotSupportedException(); 90 92 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Constant.cs
r3294 r3373 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Operators; 25 using HeuristicLab.Random;26 25 using HeuristicLab.Data; 27 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 27 using HeuristicLab.Parameters; 29 namespace HeuristicLab.Problems.DataAnalysis. Regression.Symbolic.Symbols {28 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols { 30 29 [StorableClass] 31 30 [Item("Constant", "Represents a constant value.")] -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/ConstantTreeNode.cs
r3294 r3373 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Random; 29 namespace HeuristicLab.Problems.DataAnalysis. Regression.Symbolic.Symbols {29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols { 30 30 [StorableClass] 31 31 public sealed class ConstantTreeNode : SymbolicExpressionTreeTerminalNode { -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Variable.cs
r3294 r3373 29 29 using System.Collections.Generic; 30 30 using System; 31 namespace HeuristicLab.Problems.DataAnalysis. Regression.Symbolic.Symbols {31 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols { 32 32 [StorableClass] 33 33 [Item("Variable", "Represents a variable value.")] -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableTreeNode.cs
r3294 r3373 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Random; 29 namespace HeuristicLab.Problems.DataAnalysis. Regression.Symbolic.Symbols {29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols { 30 30 [StorableClass] 31 31 public sealed class VariableTreeNode : SymbolicExpressionTreeTerminalNode { -
trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/HeuristicLab.ThreadParallelEngine-3.3.csproj
r2546 r3373 87 87 <Compile Include="ThreadParallelEngine.cs" /> 88 88 <Compile Include="ThreadParallelEngineView.cs"> 89 <SubType>UserControl</SubType>90 89 </Compile> 91 90 <Compile Include="ThreadParallelEngineView.Designer.cs">
Note: See TracChangeset
for help on using the changeset viewer.