Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10062


Ignore:
Timestamp:
10/17/13 21:52:35 (9 years ago)
Author:
gkronber
Message:

#2026 worked on brute force code generator, removed unused references, worked on compatibility with mono.

Location:
branches/HeuristicLab.Problems.GPDL
Files:
5 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Problems.GPDL/GpdlCompiler/GpdlCompiler.csproj

    r9696 r10062  
    3333  </PropertyGroup>
    3434  <ItemGroup>
    35     <Reference Include="ALGLIB-3.7.0">
    36       <HintPath>..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
    37       <Private>True</Private>
    38     </Reference>
    39     <Reference Include="HeuristicLab.Algorithms.GeneticAlgorithm-3.3">
    40       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath>
    41       <Private>True</Private>
    42     </Reference>
    43     <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3">
    44       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll</HintPath>
    45       <Private>True</Private>
    46     </Reference>
    47     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
    48       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    49       <Private>True</Private>
    50     </Reference>
    51     <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    52       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    53       <Private>True</Private>
    54     </Reference>
    55     <Reference Include="HeuristicLab.ParallelEngine-3.3">
    56       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.ParallelEngine-3.3.dll</HintPath>
    57       <Private>True</Private>
    58     </Reference>
    59     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    60       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    61       <Private>True</Private>
    62     </Reference>
    63     <Reference Include="HeuristicLab.Problems.Instances-3.3">
    64       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    65       <Private>True</Private>
    66     </Reference>
    67     <Reference Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3">
    68       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll</HintPath>
    69       <Private>True</Private>
    70     </Reference>
    71     <Reference Include="HeuristicLab.Random-3.3">
    72       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    73       <Private>True</Private>
    74     </Reference>
    75     <Reference Include="HeuristicLab.Selection-3.3">
    76       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
    77       <Private>True</Private>
    78     </Reference>
    79     <Reference Include="HeuristicLab.SequentialEngine-3.3">
    80       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
    81       <Private>True</Private>
    82     </Reference>
    83     <Reference Include="System" />
    8435    <Reference Include="System.Core" />
    85     <Reference Include="System.Xml.Linq" />
    86     <Reference Include="System.Data.DataSetExtensions" />
    87     <Reference Include="Microsoft.CSharp" />
    88     <Reference Include="System.Data" />
    89     <Reference Include="System.Xml" />
    9036  </ItemGroup>
    9137  <ItemGroup>
    … …  
    9440  </ItemGroup>
    9541  <ItemGroup>
     42    <ProjectReference Include="..\CodeGenerator\CodeGenerator.csproj">
     43      <Project>{5561a84d-887a-48d8-8e82-ce8b44ad135f}</Project>
     44      <Name>CodeGenerator</Name>
     45    </ProjectReference>
    9646    <ProjectReference Include="..\HeuristicLab.Problems.GPDL\3.4\HeuristicLab.Problems.GPDL-3.4.csproj">
    9747      <Project>{e4ee5afb-d552-447b-8a16-6cbe7938af32}</Project>

  • branches/HeuristicLab.Problems.GPDL/GpdlCompiler/Program.cs

    r9842 r10062  
    2121
    2222using System;
     23using CodeGenerator;
    2324using HeuristicLab.Problems.GPDL;
    2425
    … …  
    3132      Parser parser = new Parser(scanner);
    3233      parser.Parse();
     34      var codeGen = new BruteForceCodeGen();
     35
     36      codeGen.Generate(parser.AbstractSyntaxTree);
    3337    } else
    3438      Console.WriteLine("-- No source file specified");
    3539  }
    36 
    3740}

  • branches/HeuristicLab.Problems.GPDL/HeuristicLab.Grammars/3.3/HeuristicLab.Grammars-3.3.csproj

    r10059 r10062  
    105105      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    106106    </Reference>
    107     <Reference Include="System.Drawing" />
    108     <Reference Include="System.Windows.Forms" />
    109     <Reference Include="System.Windows.Forms.DataVisualization" />
    110     <Reference Include="System.Xml.Linq">
    111       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    112     </Reference>
    113     <Reference Include="System.Data.DataSetExtensions">
    114       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    115     </Reference>
    116     <Reference Include="System.Data" />
    117     <Reference Include="System.Xml" />
    118107  </ItemGroup>
    119108  <ItemGroup>

  • branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.sln

    r10054 r10062  
    3030EndProject
    3131Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Grammars-3.3", "HeuristicLab.Grammars\3.3\HeuristicLab.Grammars-3.3.csproj", "{A5452B63-B33B-4F9F-9E81-98B75EDB5612}"
     32EndProject
     33Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGenerator", "CodeGenerator\CodeGenerator.csproj", "{5561A84D-887A-48D8-8E82-CE8B44AD135F}"
     34EndProject
     35Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{E2060931-6700-464B-9E82-50846D7AE4E9}"
     36  ProjectSection(SolutionItems) = preProject
     37    Examples\Artificial Ant.txt = Examples\Artificial Ant.txt
     38    Examples\EvenParity.txt = Examples\EvenParity.txt
     39    Examples\Factorial.txt = Examples\Factorial.txt
     40    Examples\Fib.txt = Examples\Fib.txt
     41    Examples\LawnMower.txt = Examples\LawnMower.txt
     42    Examples\multi-output-multiplier.txt = Examples\multi-output-multiplier.txt
     43    Examples\Multiplexer.txt = Examples\Multiplexer.txt
     44    Examples\symbreg HEAL.txt = Examples\symbreg HEAL.txt
     45    Examples\symbreg Koza.txt = Examples\symbreg Koza.txt
     46  EndProjectSection
    3247EndProject
    3348Global
    … …  
    89104    {A5452B63-B33B-4F9F-9E81-98B75EDB5612}.Release|x86.ActiveCfg = Release|x86
    90105    {A5452B63-B33B-4F9F-9E81-98B75EDB5612}.Release|x86.Build.0 = Release|x86
     106    {5561A84D-887A-48D8-8E82-CE8B44AD135F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     107    {5561A84D-887A-48D8-8E82-CE8B44AD135F}.Debug|Any CPU.Build.0 = Debug|Any CPU
     108    {5561A84D-887A-48D8-8E82-CE8B44AD135F}.Debug|x64.ActiveCfg = Debug|Any CPU
     109    {5561A84D-887A-48D8-8E82-CE8B44AD135F}.Debug|x86.ActiveCfg = Debug|Any CPU
     110    {5561A84D-887A-48D8-8E82-CE8B44AD135F}.Release|Any CPU.ActiveCfg = Release|Any CPU
     111    {5561A84D-887A-48D8-8E82-CE8B44AD135F}.Release|Any CPU.Build.0 = Release|Any CPU
     112    {5561A84D-887A-48D8-8E82-CE8B44AD135F}.Release|x64.ActiveCfg = Release|Any CPU
     113    {5561A84D-887A-48D8-8E82-CE8B44AD135F}.Release|x86.ActiveCfg = Release|Any CPU
    91114  EndGlobalSection
    92115  GlobalSection(SolutionProperties) = preSolution
    … …  
    95118  GlobalSection(NestedProjects) = preSolution
    96119    {582440C3-BB33-4683-A5EC-673AB51A7AB3} = {3768D612-38EB-47D8-9E79-75D8E5AB00A8}
     120    {E2060931-6700-464B-9E82-50846D7AE4E9} = {3768D612-38EB-47D8-9E79-75D8E5AB00A8}
    97121  EndGlobalSection
    98122  GlobalSection(Performance) = preSolution

  • branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/HeuristicLab.Problems.GPDL-3.4.csproj

    r10058 r10062  
    103103      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    104104    </Reference>
    105     <Reference Include="System.Drawing" />
    106     <Reference Include="System.Windows.Forms" />
    107     <Reference Include="System.Windows.Forms.DataVisualization" />
    108     <Reference Include="System.Xml.Linq">
    109       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    110     </Reference>
    111     <Reference Include="System.Data.DataSetExtensions">
    112       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    113     </Reference>
    114     <Reference Include="System.Data" />
    115     <Reference Include="System.Xml" />
    116105  </ItemGroup>
    117106  <ItemGroup>
    … …  
    153142  -->
    154143  <PropertyGroup>
    155     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     144    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    156145set ProjectDir=$(ProjectDir)
    157146set SolutionDir=$(SolutionDir)
    158147set Outdir=$(Outdir)
    159148
    160 call GenerateFromAtg.cmd</PreBuildEvent>
     149call GenerateFromAtg.cmd
     150</PreBuildEvent>
     151    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     152export ProjectDir=$(ProjectDir)
     153export SolutionDir=$(SolutionDir)
     154export Outdir=$(Outdir)
     155
     156$SolutionDir/GenerateFromAtg.sh
     157</PreBuildEvent>
    161158  </PropertyGroup>
    162159</Project>

  • branches/HeuristicLab.Problems.GPDL/SyntaxAnalyzer/SyntaxAnalyzer.csproj

    r9725 r10062  
    3333  </PropertyGroup>
    3434  <ItemGroup>
    35     <Reference Include="System" />
    3635    <Reference Include="System.Core" />
    37     <Reference Include="System.Xml.Linq" />
    38     <Reference Include="System.Data.DataSetExtensions" />
    39     <Reference Include="Microsoft.CSharp" />
    40     <Reference Include="System.Data" />
    41     <Reference Include="System.Xml" />
    4236  </ItemGroup>
    4337  <ItemGroup>
    … …  
    5347  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    5448  <PropertyGroup>
    55     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     49    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    5650set ProjectDir=$(ProjectDir)
    5751set SolutionDir=$(SolutionDir)
    5852set Outdir=$(Outdir)
    5953
    60 call GenerateFromAtg.cmd</PreBuildEvent>
     54call GenerateFromAtg.cmd
     55</PreBuildEvent>
     56    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     57export ProjectDir=$(ProjectDir)
     58export SolutionDir=$(SolutionDir)
     59export Outdir=$(Outdir)
     60
     61$SolutionDir/GenerateFromAtg.sh
     62</PreBuildEvent>
    6163  </PropertyGroup>
    6264  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/HeuristicLab.Problems.GPDL/Test/Test.csproj

    r10058 r10062  
    3535    <WarningLevel>4</WarningLevel>
    3636  </PropertyGroup>
    37   <ItemGroup>
    38     <Reference Include="ALGLIB-3.7.0">
    39       <HintPath>..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
    40       <Private>True</Private>
    41     </Reference>
    42     <Reference Include="HeuristicLab.Algorithms.GeneticAlgorithm-3.3">
    43       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath>
    44       <Private>True</Private>
    45     </Reference>
    46     <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3">
    47       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll</HintPath>
    48       <Private>True</Private>
    49     </Reference>
    50     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    51       <SpecificVersion>False</SpecificVersion>
    52       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    53       <Private>True</Private>
    54     </Reference>
    55     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    56       <SpecificVersion>False</SpecificVersion>
    57       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    58       <Private>True</Private>
    59     </Reference>
    60     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    61       <SpecificVersion>False</SpecificVersion>
    62       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    63     </Reference>
    64     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
    65       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    66       <Private>True</Private>
    67     </Reference>
    68     <Reference Include="HeuristicLab.Operators-3.3">
    69       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    70       <Private>True</Private>
    71     </Reference>
    72     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    73       <SpecificVersion>False</SpecificVersion>
    74       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    75       <Private>True</Private>
    76     </Reference>
    77     <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    78       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    79       <Private>True</Private>
    80     </Reference>
    81     <Reference Include="HeuristicLab.ParallelEngine-3.3">
    82       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.ParallelEngine-3.3.dll</HintPath>
    83       <Private>True</Private>
    84     </Reference>
    85     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    86       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    87       <Private>True</Private>
    88     </Reference>
    89     <Reference Include="HeuristicLab.Problems.Instances-3.3">
    90       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    91       <Private>True</Private>
    92     </Reference>
    93     <Reference Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3">
    94       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll</HintPath>
    95       <Private>True</Private>
    96     </Reference>
    97     <Reference Include="HeuristicLab.Random-3.3">
    98       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    99       <Private>True</Private>
    100     </Reference>
    101     <Reference Include="HeuristicLab.SequentialEngine-3.3">
    102       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
    103       <Private>True</Private>
    104     </Reference>
    105     <Reference Include="System" />
    106   </ItemGroup>
    10737  <Choose>
    10838    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
Note: See TracChangeset for help on using the changeset viewer.