Changeset 1a13c7c in git

Timestamp:

Feb 3, 2018, 9:21:08 AM (6 years ago)

Author:

Jeroen Demeyer <jdemeyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

48ee38d3a169f00f44e0427a80903a8b1016ace1

Parents:

00c216deb7e8f06cbb20ed3dad72bd5804a8eb66

git-author:

Jeroen Demeyer <jdemeyer@cage.ugent.be>2018-02-03 09:21:08+01:00

git-committer:

Jeroen Demeyer <jdemeyer@cage.ugent.be>2018-02-03 09:21:19+01:00

Message:

Avoid some floor() calls

File:

• Singular/walk.cc (modified) (3 diffs)

Singular/walk.cc

@@ -2303 +2303 @@
       for(j=0; j<nRing; j++)
       {
-        (*diff_weight1)[j] = floor(0.1*(*diff_weight1)[j] + 0.5);
+        (*diff_weight1)[j] = ((*diff_weight1)[j] + 5) / 10;
       }
     }
@@ -2318 +2318 @@
         (*curr_weight)[j] = (*diff_weight1)[j];
         j = MivAbsMaxArg(diff_weight1);
-        (*diff_weight1)[j] = floor(0.1*(*diff_weight1)[j] + 0.5);
+        (*diff_weight1)[j] = ((*diff_weight1)[j] + 5) / 10;
       }
     }
@@ -4561 +4561 @@
           weight_norm = weight_norm + (*next_weight2)[i]*(*next_weight2)[i];
         }
-        weight_norm = 1 + floor(sqrt(weight_norm));
+        weight_norm = 1 + static_cast<int>(sqrt(double(weight_norm)));
       }
       for(i=0; i<nV; i++)