Mercurial > ldforge / file diff

--- a/src/ringFinder.cc	Mon Aug 04 13:43:54 2014 +0300
+++ b/src/ringFinder.cc	Wed Aug 06 16:18:24 2014 +0300
@@ -37,7 +37,7 @@
 	double num = r0 / scale;
 
 	// If the ring number is integral, we have found a fitting ring to r0 -> r1!
-	if (isInteger (num))
+	if (IsIntegral (num))
 	{
 		Component cmp;
 		cmp.scale = scale;
@@ -55,7 +55,7 @@
 	else
 	{
 		// Try find solutions by splitting the ring in various positions.
-		if (isZero (r1 - r0))
+		if (IsZero (r1 - r0))
 			return false;
 
 		double interval;
@@ -130,7 +130,7 @@
 	// components.
 	double scale = 1.0;
 
-	if (not isZero (scale = r0 - floor (r0)) or not isZero (scale = r1 - floor (r1)))
+	if (not IsZero (scale = r0 - floor (r0)) or not IsZero (scale = r1 - floor (r1)))
 	{
 		double r0f = r0 / scale;
 		double r1f = r1 / scale;
@@ -197,8 +197,8 @@
 
 	for (int i = 0; i < getComponents().size(); ++i)
 	{
-		maxA = max (getComponents()[i].num, maxA);
-		maxB = max (other->getComponents()[i].num, maxB);
+		maxA = Max (getComponents()[i].num, maxA);
+		maxB = Max (other->getComponents()[i].num, maxB);
 	}
 
 	if (maxA != maxB)