Changeset b8f55af in tol

Timestamp:

May 28, 2015, 9:26:03 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

7abace5

Parents:

bb4284b

Message:

Refs #1834
Se evita la dependencia explícita de tol_bpolyn.h con boost.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6740 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/bmath

Files:

• matfun.cpp (modified) (2 diffs)
• mathobjects/tol_bpolyn.h (modified) (2 diffs)
• tol_bmatfun.h (modified) (1 diff)

tol/bmath/matfun.cpp

@@ -30 +30 @@
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_sf_hyperg.h>
+
+#include <boost/math/common_factor_rt.hpp>
 
 #define LIMITFactorial  100
@@ -996 +998 @@
 };
 
-
+//--------------------------------------------------------------------
+BInt GCD(const BInt& a, const BInt& b)
+      
+/*! Returns the Greatest Common Divisor of two integers
+ */
+//--------------------------------------------------------------------
+{
+    return(boost::math::gcd(a, b));
+};
+
+//--------------------------------------------------------------------
+BInt LCM(const BInt& a, const BInt& b)
+      
+/*! Returns the Least Common Multiple of two integers
+ */
+//--------------------------------------------------------------------
+{
+    return(boost::math::lcm(a, b));
+};
+

tol/bmath/mathobjects/tol_bpolyn.h

@@ -24 +24 @@
 
 #include <tol/tol_bmonome.h>
-#include <boost/math/common_factor_rt.hpp>
+#include <tol/tol_bmatfun.h>
 #include <limits>
 
@@ -370 +370 @@
   {
     deg = (*this)(i).Degree();
-    if(deg) { gcd = boost::math::gcd(gcd,deg); }
+    if(deg) { gcd = GCD(gcd,deg); }
   }
   return(gcd);

tol/bmath/tol_bmatfun.h

@@ -69 +69 @@
 BDat InvFactorial(const BDat& x);
 
+BInt GCD(const BInt& m, const BInt& n);
+BInt LCM(const BInt& m, const BInt& n);
+
 #endif  // TOL_BMATFUN_H