Changeset 94d062 in git

Timestamp:

Apr 14, 1998, 5:29:46 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

8677912280afed4016cd16f860024d5d2390f1e7

Parents:

b1b0b32e97337832321183b3829223506e117514

Message:

* wichmann: Added error-Checks for findUniProc().


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

File:

• Singular/fglm.cc (modified) (6 diffs)

Singular/fglm.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglm.cc,v 1.12 1998-01-23 14:20:38 obachman Exp $ 
+// $Id: fglm.cc,v 1.13 1998-04-14 15:29:46 Singular Exp $ 
 
 /****************************************
@@ -6 +6 @@
 ****************************************/
 /* 
-* ABSTRACT - The FGLM-Algorithm
+* ABSTRACT - The FGLM-Algorithm plus extension
 *   Calculate a reduced groebner basis for one ordering, given a 
 *   reduced groebner basis for another ordering.
@@ -13 +13 @@
 *   if the input is homogeneous ( then fglmhom.cc is used. Yet 
 *   not implemented ).
+*   The extension (finduni) finds minimal univariate Polynomials
+*   lying in a 0-dimensional ideal.
 */
 
@@ -201 +203 @@
 }
 
-//     Checks if the ideal "theIdeal" is zero-dimensional and minimal. It does
-//      not check, if it is reduced. 
-//     returns FglmOk if we can use theIdeal for CalculateFunctionals (this 
-//                     function reports an error if theIdeal is not reduced, 
-//                     so this need not to be tested here)
-//             FglmNotReduced if theIdeal is not minimal
-//             FglmNotZeroDim if it is not zero-dimensional
-//             FglmHasOne if 1 belongs to theIdeal
+// Checks if the ideal "theIdeal" is zero-dimensional and minimal. It does
+//  not check, if it is reduced. 
+// returns FglmOk if we can use theIdeal for CalculateFunctionals (this 
+//                 function reports an error if theIdeal is not reduced, 
+//                 so this need not to be tested here)
+//         FglmNotReduced if theIdeal is not minimal
+//         FglmNotZeroDim if it is not zero-dimensional
+//         FglmHasOne if 1 belongs to theIdeal
 FglmState 
 fglmIdealcheck( const ideal theIdeal )
@@ -239 +241 @@
 }
 
-//     the main function for the fglm-Algorithm. 
-//     Checks the input-data, calls CalculateFunctionals, handles change
-//     of ring-vars and finaly calls GroebnerViaFunctionals.
-//     returns the new groebnerbasis or 0 if an error occoured.
+// The main function for the fglm-Algorithm. 
+// Checks the input-data, and calls fglmzero (see fglmzero.cc).
+// Returns the new groebnerbasis or 0 if an error occoured.
 BOOLEAN
 fglmProc( leftv result, leftv first, leftv second ) 
@@ -316 +317 @@
 }
 
+// The main function for finduni().
+// Checks the input-data, and calls FindUnivariateWrapper (see fglmzero.cc).
+// Returns an ideal containing the univariate Polynomials or 0 if an error
+// has occoured.
 BOOLEAN
 findUniProc( leftv result, leftv first ) 
 {
     ideal sourceIdeal;
-    ideal destIdeal;
+    ideal destIdeal = NULL;
+    FglmState state;
     
     idhdl sourceIdealHdl = (idhdl)first->data;
     sourceIdeal= IDIDEAL(sourceIdealHdl);
-    
-    destIdeal= FindUnivariateWrapper( sourceIdeal );
+
+    assumeStdFlag( first );
+    state= fglmIdealcheck( sourceIdeal );
+    if ( state == FglmOk ) {
+        if ( FindUnivariateWrapper( sourceIdeal, destIdeal ) == FALSE )
+            state = FglmNotReduced;
+    }
+    switch (state) {
+        case FglmOk:
+            break;
+        case FglmHasOne:
+            destIdeal= idInit(1,1);
+            (destIdeal->m)[0]= pOne();
+            state= FglmOk;
+            break;
+        case FglmNotZeroDim:
+            Werror( "The ideal %s has to be 0-dimensional", first->Name() );
+            destIdeal= idInit(0,0);
+            break;
+        case FglmNotReduced:
+            Werror( "The ideal %s has to be reduced", first->Name() );
+            destIdeal= idInit(0,0);
+            break;
+        default:
+            destIdeal= idInit(1,1);
+    }
     
     result->rtyp = IDEAL_CMD;
     result->data= (void *)destIdeal;
     
-        return FALSE;
+    return FALSE;
 }
 #endif