Changeset 15ebcf in git for factory/fac_cantzass.cc

Timestamp:

May 11, 1998, 11:37:40 AM (25 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

c40119ecffa51b841f092c090d4c4a4e5be673d0

Parents:

2b665389fc600901255b1c76a0cd8d14bd860556

Message:

	* fac_cantzass.cc (CantorZassenhausFactorFFGF,
	  CantorZassenhausFactorExt): new local variables `firstFactor',
	  `secondFactor' introduced to fix order of evaluation of
	  recursive factorizations


git-svn-id: file:///usr/local/Singular/svn/trunk@1678 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/fac_cantzass.cc (modified) (3 diffs)

factory/fac_cantzass.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_cantzass.cc,v 1.4 1997-12-08 18:24:28 schmidt Exp $ */
+/* $Id: fac_cantzass.cc,v 1.5 1998-05-11 09:37:40 schmidt Exp $ */
 
 #include <config.h>
@@ -156 +156 @@
         b = randomPoly( d, x, gen );
         f1 = gcd( b, f );
-        if ( (d1 = f1.degree(x)) > 0 && d1 < d )
-            return Union( CantorZassenhausFactorFFGF( f1, s, q, gen ), CantorZassenhausFactorFFGF( f/f1, s, q, gen ) );
-        else {
+        if ( (d1 = f1.degree(x)) > 0 && d1 < d ) {
+            CFFList firstFactor = CantorZassenhausFactorFFGF( f1, s, q, gen );
+            CFFList secondFactor = CantorZassenhausFactorFFGF( f/f1, s, q, gen );
+            return Union( firstFactor, secondFactor );
+        } else {
             f1 = gcd( f, powerMod2( b, q, s, f ) - 1 );
-            if ( (d1 = f1.degree(x)) > 0 && d1 < d )
-                return Union( CantorZassenhausFactorFFGF( f1, s, q, gen ), CantorZassenhausFactorFFGF( f/f1, s, q, gen ) );
+            if ( (d1 = f1.degree(x)) > 0 && d1 < d ) {
+                CFFList firstFactor = CantorZassenhausFactorFFGF( f1, s, q, gen );
+                CFFList secondFactor = CantorZassenhausFactorFFGF( f/f1, s, q, gen );
+                return Union( firstFactor, secondFactor );
+            }
         }
     }
@@ -178 +183 @@
         b = randomPoly( d, x, gen );
         f1 = gcd( b, f );
-        if ( (d1 = f1.degree(x)) > 0 && d1 < d )
-            return Union( CantorZassenhausFactorExt( f1, s, q, gen ), CantorZassenhausFactorExt( f/f1, s, q, gen ) );
-        else {
+        if ( (d1 = f1.degree(x)) > 0 && d1 < d ) {
+            CFFList firstFactor = CantorZassenhausFactorExt( f1, s, q, gen );
+            CFFList secondFactor = CantorZassenhausFactorExt( f/f1, s, q, gen );
+            return Union( firstFactor, secondFactor );
+        } else {
             f1 = gcd( f, powerMod2( b, q, s, f ) - 1 );
-            if ( (d1 = f1.degree(x)) > 0 && d1 < d )
-                return Union( CantorZassenhausFactorExt( f1, s, q, gen ), CantorZassenhausFactorExt( f/f1, s, q, gen ) );
+            if ( (d1 = f1.degree(x)) > 0 && d1 < d ) {
+                CFFList firstFactor = CantorZassenhausFactorExt( f1, s, q, gen );
+                CFFList secondFactor = CantorZassenhausFactorExt( f/f1, s, q, gen );
+                return Union( firstFactor, secondFactor );
+            }
         }
     }