Ignore:
Timestamp:
07/08/19 00:23:12 (3 years ago)
Author:
mkommend
Message:

#2520: Merged 16584, 16585,16594,16595, 16625, 16658, 16659, 16672, 16707, 16729, 16792, 16796, 16797, 16799, 16819, 16906, 16907, 16908, 16933, 16945, 16992, 16994, 16995, 16996, 16997, 17014, 17015, 17017, 17020, 17021, 17022, 17023, 17024, 17029, 17086, 17087, 17088, 17089 into stable.

Location:
stable
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r17101 r17105  
    107107      <Private>False</Private>
    108108    </Reference>
    109     <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
    110       <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    111     </Reference>
    112109    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    113       <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     110      <SpecificVersion>False</SpecificVersion>
     111      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
    114112    </Reference>
    115113    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.NativeInterpreter-0.1, Version=0.0.0.1, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     
    123121    </Reference>
    124122    <Reference Include="System.Drawing" />
    125     <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    126       <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
    127     </Reference>
    128123    <Reference Include="System.Xml.Linq">
    129124      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    295290    <Compile Include="TreeMatching\SymbolicExpressionTreePhenotypicSimilarityCalculator.cs" />
    296291    <None Include="HeuristicLab.snk" />
    297     <None Include="packages.config" />
    298292    <None Include="Plugin.cs.frame" />
    299293    <None Include="Properties\AssemblyInfo.cs.frame" />
  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs

    r17103 r17105  
    445445            Label c1 = il.DefineLabel();
    446446            CompileInstructions(il, state, ds);
    447             il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // > 0
     447            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // > 0
    448448            il.Emit(System.Reflection.Emit.OpCodes.Cgt);
    449449            il.Emit(System.Reflection.Emit.OpCodes.Brfalse, c1);
     
    460460            CompileInstructions(il, state, ds);
    461461            for (int i = 1; i < nArgs; i++) {
    462               il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // > 0
     462              il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // > 0
    463463              il.Emit(System.Reflection.Emit.OpCodes.Cgt);
    464464              il.Emit(System.Reflection.Emit.OpCodes.Brfalse, falseBranch);
    465465              CompileInstructions(il, state, ds);
    466466            }
    467             il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // > 0
     467            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // > 0
    468468            il.Emit(System.Reflection.Emit.OpCodes.Cgt);
    469469            il.Emit(System.Reflection.Emit.OpCodes.Brfalse, falseBranch);
     
    485485              // complex definition because of special properties of NaN 
    486486              il.Emit(System.Reflection.Emit.OpCodes.Dup);
    487               il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // <= 0       
     487              il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // <= 0       
    488488              il.Emit(System.Reflection.Emit.OpCodes.Ble, nextArgBranch);
    489489              il.Emit(System.Reflection.Emit.OpCodes.Br, resultBranch);
     
    493493            }
    494494            il.MarkLabel(resultBranch);
    495             il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // > 0
     495            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // > 0
    496496            il.Emit(System.Reflection.Emit.OpCodes.Cgt);
    497497            il.Emit(System.Reflection.Emit.OpCodes.Brtrue, trueBranch);
     
    506506        case OpCodes.NOT: {
    507507            CompileInstructions(il, state, ds);
    508             il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // > 0
     508            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // > 0
    509509            il.Emit(System.Reflection.Emit.OpCodes.Cgt);
    510510            il.Emit(System.Reflection.Emit.OpCodes.Conv_R8); // convert to float64
     
    518518        case OpCodes.XOR: {
    519519            CompileInstructions(il, state, ds);
    520             il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0);
     520            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0);
    521521            il.Emit(System.Reflection.Emit.OpCodes.Cgt);// > 0
    522522
    523523            for (int i = 1; i < nArgs; i++) {
    524524              CompileInstructions(il, state, ds);
    525               il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0);
     525              il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0);
    526526              il.Emit(System.Reflection.Emit.OpCodes.Cgt);// > 0
    527527              il.Emit(System.Reflection.Emit.OpCodes.Xor);
  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Plugin.cs.frame

    r17097 r17105  
    4242  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    4343  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    44   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     44  [PluginDependency("HeuristicLab.Attic", "1.0")]
    4545  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4646  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.