Free cookie consent management tool by TermsFeed Policy Generator

Changeset 17590


Ignore:
Timestamp:
06/08/20 14:03:32 (5 years ago)
Author:
chaider
Message:

#3073

  • Added DataAnalysis.Symbolic (Corrected path)
  • Changed includes/paths
  • Added solution
Location:
branches/3073_IA_constraint_splitting
Files:
8 added
1 deleted
2 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r17413 r17590  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     53    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
    … …  
    6060  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6161    <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     62    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    6363    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6464    <DebugType>full</DebugType>
    65     <PlatformTarget>x64</PlatformTarget>
     65    <PlatformTarget>AnyCPU</PlatformTarget>
    6666    <ErrorReport>prompt</ErrorReport>
    6767    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    … …  
    6969  </PropertyGroup>
    7070  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    71     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     71    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    7272    <DefineConstants>TRACE</DefineConstants>
    7373    <Optimize>true</Optimize>
    7474    <DebugType>pdbonly</DebugType>
    75     <PlatformTarget>x64</PlatformTarget>
     75    <PlatformTarget>AnyCPU</PlatformTarget>
    7676    <ErrorReport>prompt</ErrorReport>
    7777    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    … …  
    8080  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    8181    <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     82    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    8383    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8484    <DebugType>full</DebugType>
    85     <PlatformTarget>x86</PlatformTarget>
     85    <PlatformTarget>AnyCPU</PlatformTarget>
    8686    <ErrorReport>prompt</ErrorReport>
    8787    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    … …  
    8989  </PropertyGroup>
    9090  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    91     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     91    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    9292    <DefineConstants>TRACE</DefineConstants>
    9393    <Optimize>true</Optimize>
    9494    <DebugType>pdbonly</DebugType>
    95     <PlatformTarget>x86</PlatformTarget>
     95    <PlatformTarget>AnyCPU</PlatformTarget>
    9696    <ErrorReport>prompt</ErrorReport>
    9797    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    … …  
    100100  <ItemGroup>
    101101    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103       <Private>False</Private>
     102      <SpecificVersion>False</SpecificVersion>
     103      <HintPath>..\..\..\..\trunk\bin\ALGLIB-3.7.0.dll</HintPath>
    104104    </Reference>
    105105    <Reference Include="AutoDiff-1.0, Version=1.0.0.14388, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    106       <HintPath>..\..\bin\AutoDiff-1.0.dll</HintPath>
    107       <Private>False</Private>
    108     </Reference>
    109     <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    110       <SpecificVersion>False</SpecificVersion>
    111       <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     106      <SpecificVersion>False</SpecificVersion>
     107      <HintPath>..\..\..\..\trunk\bin\AutoDiff-1.0.dll</HintPath>
     108    </Reference>
     109    <Reference Include="HEAL.Attic, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     110      <SpecificVersion>False</SpecificVersion>
     111      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     114      <SpecificVersion>False</SpecificVersion>
     115      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     116    </Reference>
     117    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     118      <SpecificVersion>False</SpecificVersion>
     119      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     120    </Reference>
     121    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     122      <SpecificVersion>False</SpecificVersion>
     123      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath>
     124    </Reference>
     125    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     126      <SpecificVersion>False</SpecificVersion>
     127      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     128    </Reference>
     129    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     130      <SpecificVersion>False</SpecificVersion>
     131      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath>
     132    </Reference>
     133    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     134      <SpecificVersion>False</SpecificVersion>
     135      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath>
     136    </Reference>
     137    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     138      <SpecificVersion>False</SpecificVersion>
     139      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     140    </Reference>
     141    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     142      <SpecificVersion>False</SpecificVersion>
     143      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     144    </Reference>
     145    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     146      <SpecificVersion>False</SpecificVersion>
     147      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     148    </Reference>
     149    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     150      <SpecificVersion>False</SpecificVersion>
     151      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     152    </Reference>
     153    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     154      <SpecificVersion>False</SpecificVersion>
     155      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     156    </Reference>
     157    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     158      <SpecificVersion>False</SpecificVersion>
     159      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     160    </Reference>
     161    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     162      <SpecificVersion>False</SpecificVersion>
     163      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     164    </Reference>
     165    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     166      <SpecificVersion>False</SpecificVersion>
     167      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    112168    </Reference>
    113169    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.NativeInterpreter-0.1, Version=0.0.0.1, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    114170      <SpecificVersion>False</SpecificVersion>
    115       <HintPath>..\..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.NativeInterpreter-0.1.dll</HintPath>
    116       <Private>False</Private>
     171      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.NativeInterpreter-0.1.dll</HintPath>
     172    </Reference>
     173    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     174      <SpecificVersion>False</SpecificVersion>
     175      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     176    </Reference>
     177    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     178      <SpecificVersion>False</SpecificVersion>
     179      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Random-3.3.dll</HintPath>
     180    </Reference>
     181    <Reference Include="HeuristicLab.Selection-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     182      <SpecificVersion>False</SpecificVersion>
     183      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Selection-3.3.dll</HintPath>
    117184    </Reference>
    118185    <Reference Include="System" />
    … …  
    325392    </BootstrapperPackage>
    326393  </ItemGroup>
    327   <ItemGroup>
    328     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    329       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    330       <Name>HeuristicLab.Analysis-3.3</Name>
    331       <Private>False</Private>
    332     </ProjectReference>
    333     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    334       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    335       <Name>HeuristicLab.Collections-3.3</Name>
    336       <Private>False</Private>
    337     </ProjectReference>
    338     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    339       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    340       <Name>HeuristicLab.Common.Resources-3.3</Name>
    341       <Private>False</Private>
    342     </ProjectReference>
    343     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    344       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    345       <Name>HeuristicLab.Common-3.3</Name>
    346       <Private>False</Private>
    347     </ProjectReference>
    348     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    349       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    350       <Name>HeuristicLab.Core-3.3</Name>
    351       <Private>False</Private>
    352     </ProjectReference>
    353     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    354       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    355       <Name>HeuristicLab.Data-3.3</Name>
    356       <Private>False</Private>
    357     </ProjectReference>
    358     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    359       <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    360       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    361       <Private>False</Private>
    362     </ProjectReference>
    363     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    364       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    365       <Name>HeuristicLab.Operators-3.3</Name>
    366       <Private>False</Private>
    367     </ProjectReference>
    368     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    369       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    370       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    371       <Private>False</Private>
    372     </ProjectReference>
    373     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    374       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    375       <Name>HeuristicLab.Optimization-3.3</Name>
    376     </ProjectReference>
    377     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    378       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    379       <Name>HeuristicLab.Parameters-3.3</Name>
    380       <Private>False</Private>
    381     </ProjectReference>
    382     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    383       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    384       <Name>HeuristicLab.Persistence-3.3</Name>
    385       <Private>False</Private>
    386     </ProjectReference>
    387     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    388       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    389       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    390       <Private>False</Private>
    391     </ProjectReference>
    392     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    393       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    394       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    395       <Private>False</Private>
    396     </ProjectReference>
    397     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    398       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    399       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    400       <Private>False</Private>
    401     </ProjectReference>
    402     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    403       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    404       <Name>HeuristicLab.Random-3.3</Name>
    405       <Private>False</Private>
    406     </ProjectReference>
    407     <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
    408       <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
    409       <Name>HeuristicLab.Selection-3.3</Name>
    410     </ProjectReference>
    411   </ItemGroup>
    412394  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    413395  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

    r17180 r17590  
    6464    }
    6565
    66     private class SymbolNameComparer : IEqualityComparer<ISymbol>, IComparer<ISymbol> {
     66    private class SymbolComparer : IEqualityComparer<ISymbol>, IComparer<ISymbol> {
    6767      public int Compare(ISymbol x, ISymbol y) {
    6868        return x.Name.CompareTo(y.Name);
    … …  
    7070
    7171      public bool Equals(ISymbol x, ISymbol y) {
    72         return Compare(x, y) == 0;
     72        return x.GetType() == y.GetType();
    7373      }
    7474
    7575      public int GetHashCode(ISymbol obj) {
    76         return obj.Name.GetHashCode();
     76        return obj.GetType().GetHashCode();
    7777      }
    7878    }
    … …  
    8080    // the lookup table is also used in the corresponding formatter
    8181    internal static readonly BidirectionalLookup<string, ISymbol>
    82       knownSymbols = new BidirectionalLookup<string, ISymbol>(StringComparer.InvariantCulture, new SymbolNameComparer());
     82      knownSymbols = new BidirectionalLookup<string, ISymbol>(StringComparer.InvariantCulture, new SymbolComparer());
    8383
    8484    private Constant constant = new Constant();
Note: See TracChangeset for help on using the changeset viewer.