Changeset 10049
- Timestamp:
- 10/17/13 15:15:49 (11 years ago)
- Location:
- branches/HeuristicLab.Problems.GPDL
- Files:
-
- 10 added
- 3 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlEditor.cs
r10031 r10049 27 27 using HeuristicLab.MainForm.WindowsForms; 28 28 using HeuristicLab.Optimization; 29 using HeuristicLab.Problems.GPDL.CodeGen; 29 30 using HeuristicLab.Problems.Instances; 30 31 using HeuristicLab.Problems.Instances.Views; … … 49 50 // generate an OSGA to solve the problem 50 51 var osga = new OffspringSelectionGeneticAlgorithm(); 51 osga.Problem = parser.problem; 52 var problemGenerator = new ProblemGenerator(); 53 osga.Problem = problemGenerator.GenerateFromAst(parser.AbstractSyntaxTree); 52 54 osga.Engine = new SequentialEngine.SequentialEngine(); 53 55 osga.PopulationSize.Value = 500; -
branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/HeuristicLab.Problems.GPDL.Views-3.4.csproj
r9846 r10049 259 259 </ItemGroup> 260 260 <ItemGroup> 261 <ProjectReference Include="..\..\HeuristicLab.Problems.GPDL.CodeGen\3.4\HeuristicLab.Problems.GPDL.CodeGen-3.4.csproj"> 262 <Project>{F8481248-2A5B-48A0-A485-D3E1619C1E44}</Project> 263 <Name>HeuristicLab.Problems.GPDL.CodeGen-3.4</Name> 264 </ProjectReference> 261 265 <ProjectReference Include="..\..\HeuristicLab.Problems.GPDL\3.4\HeuristicLab.Problems.GPDL-3.4.csproj"> 262 266 <Project>{E4EE5AFB-D552-447B-8A16-6CBE7938AF32}</Project> -
branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.sln
r10031 r10049 32 32 EndProject 33 33 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Grammars-3.3", "HeuristicLab.Grammars\3.3\HeuristicLab.Grammars-3.3.csproj", "{A5452B63-B33B-4F9F-9E81-98B75EDB5612}" 34 EndProject 35 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GPDL.CodeGen-3.4", "HeuristicLab.Problems.GPDL.CodeGen\3.4\HeuristicLab.Problems.GPDL.CodeGen-3.4.csproj", "{F8481248-2A5B-48A0-A485-D3E1619C1E44}" 34 36 EndProject 35 37 Global … … 103 105 {A5452B63-B33B-4F9F-9E81-98B75EDB5612}.Release|x86.ActiveCfg = Release|x86 104 106 {A5452B63-B33B-4F9F-9E81-98B75EDB5612}.Release|x86.Build.0 = Release|x86 107 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 108 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Debug|Any CPU.Build.0 = Debug|Any CPU 109 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Debug|x64.ActiveCfg = Debug|x64 110 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Debug|x64.Build.0 = Debug|x64 111 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Debug|x86.ActiveCfg = Debug|x86 112 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Debug|x86.Build.0 = Debug|x86 113 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Release|Any CPU.ActiveCfg = Release|Any CPU 114 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Release|Any CPU.Build.0 = Release|Any CPU 115 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Release|x64.ActiveCfg = Release|x64 116 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Release|x64.Build.0 = Release|x64 117 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Release|x86.ActiveCfg = Release|x86 118 {F8481248-2A5B-48A0-A485-D3E1619C1E44}.Release|x86.Build.0 = Release|x86 105 119 EndGlobalSection 106 120 GlobalSection(SolutionProperties) = preSolution … … 110 124 {582440C3-BB33-4683-A5EC-673AB51A7AB3} = {3768D612-38EB-47D8-9E79-75D8E5AB00A8} 111 125 EndGlobalSection 126 GlobalSection(Performance) = preSolution 127 HasPerformanceSessions = true 128 EndGlobalSection 112 129 EndGlobal -
branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/GPDef.atg
r9872 r10049 28 28 29 29 COMPILER GPDef 30 public HeuristicLab.Optimization.ISingleObjectiveHeuristicOptimizationProblem problem; 31 30 public GPDefNode AbstractSyntaxTree { get; private set; } 31 32 32 CHARACTERS 33 33 letter = 'A'..'Z' + 'a'..'z'. … … 57 57 FitnessFunctionNode fitnessFunNode = null; 58 58 TerminalNode tNode = null; 59 problem = null;60 59 string src = ""; 61 60 .) … … 108 107 (. if(errors.count > 0) throw new FatalError("Syntactic or semantic errors found."); .) 109 108 "END" ident (. 110 var gen = new ProblemGenerator(); 111 problem = gen.GenerateFromAst(gpDef); 109 AbstractSyntaxTree = gpDef; 112 110 .) 113 111 '.' -
branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/HeuristicLab.Problems.GPDL-3.4.csproj
r9872 r10049 50 50 <DebugType>pdbonly</DebugType> 51 51 <Optimize>true</Optimize> 52 <OutputPath> bin\Release\</OutputPath>52 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 53 53 <DefineConstants>TRACE</DefineConstants> 54 54 <ErrorReport>prompt</ErrorReport> … … 93 93 </PropertyGroup> 94 94 <ItemGroup> 95 <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">96 <SpecificVersion>False</SpecificVersion>97 <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>98 <Private>False</Private>99 </Reference>100 <Reference Include="HeuristicLab.Algorithms.GeneticAlgorithm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">101 <SpecificVersion>False</SpecificVersion>102 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath>103 <Private>False</Private>104 </Reference>105 <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">106 <SpecificVersion>False</SpecificVersion>107 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll</HintPath>108 <Private>False</Private>109 </Reference>110 <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">111 <SpecificVersion>False</SpecificVersion>112 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>113 <Private>False</Private>114 </Reference>115 <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">116 <SpecificVersion>False</SpecificVersion>117 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>118 <Private>False</Private>119 </Reference>120 <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">121 <SpecificVersion>False</SpecificVersion>122 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>123 <Private>False</Private>124 </Reference>125 <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">126 <SpecificVersion>False</SpecificVersion>127 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>128 <Private>False</Private>129 </Reference>130 <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">131 <SpecificVersion>False</SpecificVersion>132 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>133 <Private>False</Private>134 </Reference>135 <Reference Include="HeuristicLab.ParallelEngine-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">136 <SpecificVersion>False</SpecificVersion>137 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.ParallelEngine-3.3.dll</HintPath>138 <Private>False</Private>139 </Reference>140 <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">141 <SpecificVersion>False</SpecificVersion>142 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>143 <Private>False</Private>144 </Reference>145 <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">146 <SpecificVersion>False</SpecificVersion>147 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>148 <Private>False</Private>149 </Reference>150 <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">151 <SpecificVersion>False</SpecificVersion>152 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>153 <Private>False</Private>154 </Reference>155 <Reference Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">156 <SpecificVersion>False</SpecificVersion>157 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll</HintPath>158 <Private>False</Private>159 </Reference>160 <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">161 <SpecificVersion>False</SpecificVersion>162 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>163 <Private>False</Private>164 </Reference>165 <Reference Include="HeuristicLab.Selection-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">166 <SpecificVersion>False</SpecificVersion>167 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>168 <Private>False</Private>169 </Reference>170 <Reference Include="HeuristicLab.SequentialEngine-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">171 <SpecificVersion>False</SpecificVersion>172 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.SequentialEngine-3.3.dll</HintPath>173 <Private>False</Private>174 </Reference>175 95 <Reference Include="System" /> 176 96 <Reference Include="System.Core"> … … 193 113 <Compile Include="Grammar.cs" /> 194 114 <Compile Include="Parser.cs" /> 195 <Compile Include="ProblemGenerator.cs" />196 115 <Compile Include="Scanner.cs" /> 197 <Compile Include="Util.cs" /> 116 <Compile Include="Util.cs"> 117 <SubType>Code</SubType> 118 </Compile> 198 119 <None Include="GPDef.atg" /> 199 120 <None Include="HeuristicLab.snk" /> 200 <Compile Include="Plugin.cs" />201 121 <Compile Include="Properties\AssemblyInfo.cs" /> 202 <None Include="Plugin.cs.frame" />203 122 <None Include="Properties\AssemblyInfo.cs.frame" /> 204 123 </ItemGroup> -
branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Parser.cs
r9872 r10049 28 28 int errDist = minErrDist; 29 29 30 public HeuristicLab.Optimization.ISingleObjectiveHeuristicOptimizationProblem problem;31 30 public GPDefNode AbstractSyntaxTree { get; private set; } 31 32 32 33 33 … … 107 107 FitnessFunctionNode fitnessFunNode = null; 108 108 TerminalNode tNode = null; 109 problem = null;110 109 string src = ""; 111 110 … … 181 180 Expect(12); 182 181 Expect(1); 183 var gen = new ProblemGenerator(); 184 problem = gen.GenerateFromAst(gpDef); 182 AbstractSyntaxTree = gpDef; 185 183 186 184 Expect(13);
Note: See TracChangeset
for help on using the changeset viewer.