Changeset 14755


Ignore:
Timestamp:
03/16/17 08:08:49 (7 months ago)
Author:
gkronber
Message:

#2650 merged r14749:14750 from branch to stable

Location:
branches/symbreg-factors-2650
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/symbreg-factors-2650

  • branches/symbreg-factors-2650/HeuristicLab.Common/3.3/EnumerableExtensions.cs

    r13899 r14755  
    150150      if (k > n - k)
    151151        k = n - k;
    152       long r = 1;
    153       for (long d = 1; d <= k; d++) {
    154         r *= n--;
    155         r /= d;
     152
     153      // enable explicit overflow checking for very large coefficients
     154      checked {
     155        long r = 1;
     156        for (long d = 1; d <= k; d++) {
     157          r *= n--;
     158          r /= d;
     159        }
     160        return r;
    156161      }
    157       return r;
    158162    }
    159163  }
  • branches/symbreg-factors-2650/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config

    r14754 r14755  
    2424  <connectionStrings>
    2525    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
    26     <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString=".\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=SSPI" />
     26    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3" />
    2727  </connectionStrings>
    2828
Note: See TracChangeset for help on using the changeset viewer.