Changeset 14755 for branches/symbreg-factors-2650

Timestamp:

03/16/17 08:08:49 (8 years ago)

Author:

gkronber

Message:

#2650 merged r14749:14750 from trunk to branch

Location:

branches/symbreg-factors-2650

Files:

• . (modified) (1 prop)
• HeuristicLab.Common/3.3/EnumerableExtensions.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config (modified) (1 diff)

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

@@ -150 +150 @@
       if (k > n - k)
         k = n - k;
-      long r = 1;
-      for (long d = 1; d <= k; d++) {
-        r *= n--;
-        r /= d;
+
+      // enable explicit overflow checking for very large coefficients
+      checked {
+        long r = 1;
+        for (long d = 1; d <= k; d++) {
+          r *= n--;
+          r /= d;
+        }
+        return r;
       }
-      return r;
     }
   }

branches/symbreg-factors-2650/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config

@@ -24 +24 @@
   <connectionStrings>
     <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
-    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString=".\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=SSPI" />
+    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3" />
   </connectionStrings>