Changeset 2262


Ignore:
Timestamp:
08/08/09 11:07:24 (12 years ago)
Author:
gkronber
Message:

Fixed bug in s-exp export format of terminal nodes. #715

Location:
branches/CEDMA-Exporter-715/tools
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/CEDMA-Exporter-715/tools/CedmaExporter/CedmaExporter.csproj

    r2232 r2262  
    3131    <WarningLevel>4</WarningLevel>
    3232  </PropertyGroup>
     33  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     34    <DebugSymbols>true</DebugSymbols>
     35    <OutputPath>bin\x86\Debug\</OutputPath>
     36    <DefineConstants>DEBUG;TRACE</DefineConstants>
     37    <DebugType>full</DebugType>
     38    <PlatformTarget>x86</PlatformTarget>
     39    <ErrorReport>prompt</ErrorReport>
     40  </PropertyGroup>
     41  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     42    <OutputPath>bin\x86\Release\</OutputPath>
     43    <DefineConstants>TRACE</DefineConstants>
     44    <Optimize>true</Optimize>
     45    <DebugType>pdbonly</DebugType>
     46    <PlatformTarget>x86</PlatformTarget>
     47    <ErrorReport>prompt</ErrorReport>
     48  </PropertyGroup>
    3349  <ItemGroup>
    34     <Reference Include="HeuristicLab.CEDMA.Core-3.3, Version=3.3.0.2146, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     50    <Reference Include="HeuristicLab.CEDMA.Core-3.3, Version=3.3.0.2146, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    3551      <SpecificVersion>False</SpecificVersion>
    36       <HintPath>..\..\sources\HeuristicLab\bin\Debug\plugins\HeuristicLab.CEDMA.Core-3.3.dll</HintPath>
     52      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\HeuristicLab.CEDMA.Core-3.3.dll</HintPath>
    3753    </Reference>
    38     <Reference Include="HeuristicLab.Core-3.2, Version=3.2.0.2143, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     54    <Reference Include="HeuristicLab.Core-3.2, Version=3.2.0.2143, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    3955      <SpecificVersion>False</SpecificVersion>
    40       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.0\plugins\HeuristicLab.Core-3.2.dll</HintPath>
     56      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\HeuristicLab.Core-3.2.dll</HintPath>
    4157    </Reference>
    42     <Reference Include="HeuristicLab.Data-3.2, Version=3.2.0.1609, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     58    <Reference Include="HeuristicLab.DataAnalysis-3.2, Version=3.2.0.2162, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    4359      <SpecificVersion>False</SpecificVersion>
    44       <HintPath>..\..\sources\HeuristicLab\bin\Debug\plugins\HeuristicLab.Data-3.2.dll</HintPath>
     60      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\HeuristicLab.DataAnalysis-3.2.dll</HintPath>
    4561    </Reference>
    46     <Reference Include="HeuristicLab.DataAnalysis-3.2, Version=3.2.0.2162, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     62    <Reference Include="HeuristicLab.GP-3.3, Version=3.3.0.1534, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    4763      <SpecificVersion>False</SpecificVersion>
    48       <HintPath>..\..\sources\HeuristicLab.DataAnalysis\3.2\bin\Debug\HeuristicLab.DataAnalysis-3.2.dll</HintPath>
     64      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\HeuristicLab.GP-3.3.dll</HintPath>
    4965    </Reference>
    50     <Reference Include="HeuristicLab.GP-3.3, Version=3.3.0.1534, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     66    <Reference Include="HeuristicLab.GP.StructureIdentification-3.3, Version=3.3.0.2161, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    5167      <SpecificVersion>False</SpecificVersion>
    52       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.0\plugins\HeuristicLab.GP-3.3.dll</HintPath>
     68      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\HeuristicLab.GP.StructureIdentification-3.3.dll</HintPath>
    5369    </Reference>
    54     <Reference Include="HeuristicLab.GP.StructureIdentification-3.3, Version=3.3.0.2161, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     70    <Reference Include="HeuristicLab.Modeling-3.2, Version=3.2.0.2162, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    5571      <SpecificVersion>False</SpecificVersion>
    56       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.0\plugins\HeuristicLab.GP.StructureIdentification-3.3.dll</HintPath>
     72      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\HeuristicLab.Modeling-3.2.dll</HintPath>
    5773    </Reference>
    58     <Reference Include="HeuristicLab.SupportVectorMachines-3.2, Version=3.2.0.2163, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     74    <Reference Include="HeuristicLab.PluginInfrastructure, Version=3.2.0.1990, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    5975      <SpecificVersion>False</SpecificVersion>
    60       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.0\plugins\HeuristicLab.SupportVectorMachines-3.2.dll</HintPath>
     76      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\HeuristicLab.PluginInfrastructure.dll</HintPath>
    6177    </Reference>
    62     <Reference Include="LibSVM, Version=2.84.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     78    <Reference Include="HeuristicLab.SupportVectorMachines-3.2, Version=3.2.0.2163, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    6379      <SpecificVersion>False</SpecificVersion>
    64       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.0\plugins\LibSVM.dll</HintPath>
     80      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\HeuristicLab.SupportVectorMachines-3.2.dll</HintPath>
     81    </Reference>
     82    <Reference Include="LibSVM, Version=2.84.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     83      <SpecificVersion>False</SpecificVersion>
     84      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\LibSVM.dll</HintPath>
    6585    </Reference>
    6686    <Reference Include="SemWeb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    6787      <SpecificVersion>False</SpecificVersion>
    68       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.0\plugins\SemWeb.dll</HintPath>
     88      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\SemWeb.dll</HintPath>
    6989    </Reference>
    7090    <Reference Include="SemWeb.SqliteStore, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
    7191      <SpecificVersion>False</SpecificVersion>
    72       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.0\plugins\SemWeb.SqliteStore.dll</HintPath>
     92      <HintPath>..\..\sources\HeuristicLab\bin\x86\Release\plugins\SemWeb.SqliteStore.dll</HintPath>
    7393    </Reference>
    7494    <Reference Include="System" />
  • branches/CEDMA-Exporter-715/tools/CedmaExporter/SymbolicExpressionExporter.cs

    r2232 r2262  
    7171        BuildExportString(subTree);
    7272      }
    73       if(tree.SubTrees.Count > 0) builder.Append(")");
     73      builder.Append(")");
    7474      currentIndent = currentIndent.Remove(0, 2);
    7575    }
     
    181181
    182182    public static string ExportToScheme(this Variable variable, IFunctionTree tree, Dataset ds) {
    183       return "(variable " + tree.GetLocalVariable(Variable.WEIGHT).Value + " " +
    184         ds.GetVariableName(int.Parse(tree.GetLocalVariable(Variable.INDEX).Value.ToString())) + " " + tree.GetLocalVariable(Variable.OFFSET).Value + ")";
     183      return "variable " + tree.GetLocalVariable(Variable.WEIGHT).Value + " " +
     184        ds.GetVariableName(int.Parse(tree.GetLocalVariable(Variable.INDEX).Value.ToString())) + " " + tree.GetLocalVariable(Variable.OFFSET).Value;
    185185    }
    186186    public static string ExportToScheme(this Differential differential, IFunctionTree tree, Dataset ds) {
    187       return "(differential " + tree.GetLocalVariable(Differential.WEIGHT).Value + " " +
    188         ds.GetVariableName(int.Parse(tree.GetLocalVariable(Differential.INDEX).Value.ToString())) + " " + tree.GetLocalVariable(Differential.OFFSET).Value + ")";
     187      return "differential " + tree.GetLocalVariable(Differential.WEIGHT).Value + " " +
     188        ds.GetVariableName(int.Parse(tree.GetLocalVariable(Differential.INDEX).Value.ToString())) + " " + tree.GetLocalVariable(Differential.OFFSET).Value;
    189189    }
    190190
  • branches/CEDMA-Exporter-715/tools/ConfigMerger/ConfigMerger.csproj

    r858 r2262  
    3434    <WarningLevel>4</WarningLevel>
    3535    <DocumentationFile>bin\Release\ConfigMerger.XML</DocumentationFile>
     36  </PropertyGroup>
     37  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     38    <DebugSymbols>true</DebugSymbols>
     39    <OutputPath>bin\x86\Debug\</OutputPath>
     40    <DefineConstants>DEBUG;TRACE</DefineConstants>
     41    <DebugType>full</DebugType>
     42    <PlatformTarget>x86</PlatformTarget>
     43    <ErrorReport>prompt</ErrorReport>
     44  </PropertyGroup>
     45  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     46    <OutputPath>bin\x86\Release\</OutputPath>
     47    <DefineConstants>TRACE</DefineConstants>
     48    <DocumentationFile>bin\Release\ConfigMerger.XML</DocumentationFile>
     49    <Optimize>true</Optimize>
     50    <DebugType>pdbonly</DebugType>
     51    <PlatformTarget>x86</PlatformTarget>
     52    <ErrorReport>prompt</ErrorReport>
    3653  </PropertyGroup>
    3754  <ItemGroup>
  • branches/CEDMA-Exporter-715/tools/Tools.sln

    r2228 r2262  
    1717  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1818    Debug|Any CPU = Debug|Any CPU
     19    Debug|x86 = Debug|x86
    1920    Release|Any CPU = Release|Any CPU
     21    Release|x86 = Release|x86
    2022  EndGlobalSection
    2123  GlobalSection(ProjectConfigurationPlatforms) = postSolution
    2224    {E94C5E71-3F29-408D-BCDF-23E096CA84CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    2325    {E94C5E71-3F29-408D-BCDF-23E096CA84CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
     26    {E94C5E71-3F29-408D-BCDF-23E096CA84CA}.Debug|x86.ActiveCfg = Debug|x86
     27    {E94C5E71-3F29-408D-BCDF-23E096CA84CA}.Debug|x86.Build.0 = Debug|x86
    2428    {E94C5E71-3F29-408D-BCDF-23E096CA84CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2529    {E94C5E71-3F29-408D-BCDF-23E096CA84CA}.Release|Any CPU.Build.0 = Release|Any CPU
     30    {E94C5E71-3F29-408D-BCDF-23E096CA84CA}.Release|x86.ActiveCfg = Release|Any CPU
     31    {E94C5E71-3F29-408D-BCDF-23E096CA84CA}.Release|x86.Build.0 = Release|Any CPU
    2632    {1E4B971A-83BA-4C39-BE19-D09B13CF7242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    2733    {1E4B971A-83BA-4C39-BE19-D09B13CF7242}.Debug|Any CPU.Build.0 = Debug|Any CPU
     34    {1E4B971A-83BA-4C39-BE19-D09B13CF7242}.Debug|x86.ActiveCfg = Debug|x86
     35    {1E4B971A-83BA-4C39-BE19-D09B13CF7242}.Debug|x86.Build.0 = Debug|x86
    2836    {1E4B971A-83BA-4C39-BE19-D09B13CF7242}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2937    {1E4B971A-83BA-4C39-BE19-D09B13CF7242}.Release|Any CPU.Build.0 = Release|Any CPU
     38    {1E4B971A-83BA-4C39-BE19-D09B13CF7242}.Release|x86.ActiveCfg = Release|Any CPU
     39    {1E4B971A-83BA-4C39-BE19-D09B13CF7242}.Release|x86.Build.0 = Release|Any CPU
    3040    {59334706-3386-4823-AF9B-B33CD793BA71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    3141    {59334706-3386-4823-AF9B-B33CD793BA71}.Debug|Any CPU.Build.0 = Debug|Any CPU
     42    {59334706-3386-4823-AF9B-B33CD793BA71}.Debug|x86.ActiveCfg = Debug|x86
     43    {59334706-3386-4823-AF9B-B33CD793BA71}.Debug|x86.Build.0 = Debug|x86
    3244    {59334706-3386-4823-AF9B-B33CD793BA71}.Release|Any CPU.ActiveCfg = Release|Any CPU
    3345    {59334706-3386-4823-AF9B-B33CD793BA71}.Release|Any CPU.Build.0 = Release|Any CPU
     46    {59334706-3386-4823-AF9B-B33CD793BA71}.Release|x86.ActiveCfg = Release|Any CPU
     47    {59334706-3386-4823-AF9B-B33CD793BA71}.Release|x86.Build.0 = Release|Any CPU
    3448  EndGlobalSection
    3549  GlobalSection(SolutionProperties) = preSolution
  • branches/CEDMA-Exporter-715/tools/Wizards/Wizards.csproj

    r1546 r2262  
    3232    <ErrorReport>prompt</ErrorReport>
    3333    <WarningLevel>4</WarningLevel>
     34  </PropertyGroup>
     35  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     36    <DebugSymbols>true</DebugSymbols>
     37    <OutputPath>bin\x86\Debug\</OutputPath>
     38    <DefineConstants>DEBUG;TRACE</DefineConstants>
     39    <DebugType>full</DebugType>
     40    <PlatformTarget>x86</PlatformTarget>
     41    <ErrorReport>prompt</ErrorReport>
     42  </PropertyGroup>
     43  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     44    <OutputPath>bin\x86\Release\</OutputPath>
     45    <DefineConstants>TRACE</DefineConstants>
     46    <Optimize>true</Optimize>
     47    <DebugType>pdbonly</DebugType>
     48    <PlatformTarget>x86</PlatformTarget>
     49    <ErrorReport>prompt</ErrorReport>
    3450  </PropertyGroup>
    3551  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.