Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/02/19 11:23:33 (5 years ago)
Author:
gkronber
Message:

#2520 Update HEAL.Attic to pre03

Location:
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r16568 r16585  
    111111    </Reference>
    112112    <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>
     113      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre03\lib\net461\HEAL.Attic.dll</HintPath>
    114114    </Reference>
    115115    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.NativeInterpreter-0.1, Version=0.0.0.1, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">

  • trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs

    r16565 r16585  
    425425            Label c1 = il.DefineLabel();
    426426            CompileInstructions(il, state, ds);
    427             il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // > 0
     427            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // > 0
    428428            il.Emit(System.Reflection.Emit.OpCodes.Cgt);
    429429            il.Emit(System.Reflection.Emit.OpCodes.Brfalse, c1);
    … …  
    440440            CompileInstructions(il, state, ds);
    441441            for (int i = 1; i < nArgs; i++) {
    442               il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // > 0
     442              il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // > 0
    443443              il.Emit(System.Reflection.Emit.OpCodes.Cgt);
    444444              il.Emit(System.Reflection.Emit.OpCodes.Brfalse, falseBranch);
    445445              CompileInstructions(il, state, ds);
    446446            }
    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, falseBranch);
    … …  
    465465              // complex definition because of special properties of NaN 
    466466              il.Emit(System.Reflection.Emit.OpCodes.Dup);
    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.Ble, nextArgBranch);
    469469              il.Emit(System.Reflection.Emit.OpCodes.Br, resultBranch);
    … …  
    473473            }
    474474            il.MarkLabel(resultBranch);
    475             il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // > 0
     475            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // > 0
    476476            il.Emit(System.Reflection.Emit.OpCodes.Cgt);
    477477            il.Emit(System.Reflection.Emit.OpCodes.Brtrue, trueBranch);
    … …  
    486486        case OpCodes.NOT: {
    487487            CompileInstructions(il, state, ds);
    488             il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0); // > 0
     488            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0); // > 0
    489489            il.Emit(System.Reflection.Emit.OpCodes.Cgt);
    490490            il.Emit(System.Reflection.Emit.OpCodes.Conv_R8); // convert to float64
    … …  
    498498        case OpCodes.XOR: {
    499499            CompileInstructions(il, state, ds);
    500             il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0);
     500            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0);
    501501            il.Emit(System.Reflection.Emit.OpCodes.Cgt);// > 0
    502502
    503503            for (int i = 1; i < nArgs; i++) {
    504504              CompileInstructions(il, state, ds);
    505               il.Emit(System.Reflection.Emit.OpCodes.Ldc_I4_0);
     505              il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, 0.0);
    506506              il.Emit(System.Reflection.Emit.OpCodes.Cgt);// > 0
    507507              il.Emit(System.Reflection.Emit.OpCodes.Xor);

  • trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/packages.config

    r16568 r16585  
    22<packages>
    33  <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
    4   <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
     4  <package id="HEAL.Attic" version="1.0.0-pre03" targetFramework="net461" />
    55  <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
    66  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net45" />
Note: See TracChangeset for help on using the changeset viewer.