Changeset df83c0 in git for Singular/fglmzero.cc

Timestamp:

Nov 24, 1999, 1:29:38 PM (24 years ago)

Author:

Tim Wichmann <wichmann@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

015eaa982b5452b61c7e2510ba7ecfcfc9606d1a

Parents:

d47e6fd256e2e97a44cc9bae4b289a40732b3e98

Message:

* added fglmquot


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

File:

• Singular/fglmzero.cc (modified) (10 diffs)

Singular/fglmzero.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmzero.cc,v 1.26 1999-11-15 17:20:03 obachman Exp $
+// $Id: fglmzero.cc,v 1.27 1999-11-24 12:29:37 wichmann Exp $
 
 /****************************************
@@ -31 +31 @@
 #include "maps.h"
 #include "mmemory.h"
+#include "kstd1.h" // for kNF (see fglmquot)
 #include "fglm.h"
 #include "fglmvec.h"
@@ -540 +541 @@
                 // This is the place where we can detect if the sourceIdeal
                 // is not reduced. In this case m is not in basis[]. Since basis[]
-                // is ordered this is then and only then the case, if basis[i]<m
+                // is ordered this is the case, if and only if basis[i]<m
                 // and basis[j]>m for all j>i
                 _state= FALSE;
@@ -584 +585 @@
 }
 
-//     Calculates the defining Functionals for the ideal "theIdeal" and
-//     returns them in "l".
-//     The ideal has to be zero-dimensional and reduced and has to be a
-//     real subset of the polynomal ring.
-//     In any case it has to be zero-dimensional and minimal (check this
-//      via fglmIdealcheck). Any minimal but not reduced ideal is detected.
-//      In this case it returns FglmNotReduced.
-//     If the base domain is Q, the leading coefficients of the polys
-//     have to be in Z.
-//     returns TRUE if the result is valid, FALSE if theIdeal
-//      is not reduced.
-static BOOLEAN
-CalculateFunctionals( const ideal & theIdeal, idealFunctionals & l )
-{
-    fglmSdata data( theIdeal );
+void
+internalCalculateFunctionals( const ideal & theIdeal, idealFunctionals & l,
+                              fglmSdata & data )
+{
 
     // insert pOne() into basis and update the workingList:
@@ -643 +633 @@
     l.endofConstruction();
     STICKYPROT2( "\nvdim= %i\n", data.getBasisSize() );
+    return;
+}
+
+//     Calculates the defining Functionals for the ideal "theIdeal" and
+//     returns them in "l".
+//     The ideal has to be zero-dimensional and reduced and has to be a
+//     real subset of the polynomal ring.
+//     In any case it has to be zero-dimensional and minimal (check this
+//      via fglmIdealcheck). Any minimal but not reduced ideal is detected.
+//      In this case it returns FglmNotReduced.
+//     If the base domain is Q, the leading coefficients of the polys
+//     have to be in Z.
+//     returns TRUE if the result is valid, FALSE if theIdeal
+//      is not reduced.
+static BOOLEAN
+CalculateFunctionals( const ideal & theIdeal, idealFunctionals & l )
+{
+    fglmSdata data( theIdeal );
+    internalCalculateFunctionals( theIdeal, l, data );
+    return ( data.state() );
+}
+
+static BOOLEAN
+CalculateFunctionals( const ideal & theIdeal, idealFunctionals & l,
+                      poly & p, fglmVector & v )
+{
+    fglmSdata data( theIdeal );
+    internalCalculateFunctionals( theIdeal, l, data );
+    //    STICKYPROT("Calculating vector rep\n");
+    v = data.getVectorRep( p );
+    // if ( v.isZero() ) 
+    //   STICKYPROT("vectorrep is 0\n");
     return ( data.state() );
 }
@@ -765 +787 @@
 fglmDdata::~fglmDdata()
 {
-    fglmASSERT( dimen == basisSize, "Es wurden nicht alle BasisElemente gefunden!" );
+  // STICKYPROT2("dimen= %i", dimen);
+  // STICKYPROT2("basisSize= %i", basisSize);
+  //    fglmASSERT( dimen == basisSize, "Es wurden nicht alle BasisElemente gefunden!" );
     int k;
 #ifndef HAVE_EXPLICIT_CONSTR
     delete [] gauss;
 #else
-    for ( k= dimen; k > 0; k-- )
+    // use basisSize instead of dimen because of fglmquot!
+    for ( k= basisSize; k > 0; k-- )
         gauss[k].~oldGaussElem();
     Free( (ADDRESS)gauss, (dimen+1)*sizeof( oldGaussElem ) );
@@ -776 +801 @@
     Free( (ADDRESS)isPivot, (dimen+1)*sizeof( BOOLEAN ) );
     Free( (ADDRESS)perm, (dimen+1)*sizeof( int ) );
+    // use basisSize instead of dimen because of fglmquot!
     //. Remember: There is no poly in basis[0], thus k > 0
-    for ( k= dimen; k > 0; k-- )
+    for ( k= basisSize; k > 0; k-- )
         pDelete1( basis + k );
     Free( (ADDRESS)basis, (dimen+1)*sizeof( poly ) );
@@ -975 +1001 @@
 
 static ideal
-GroebnerViaFunctionals( const idealFunctionals & l )
-// Calculates the groebnerBasis for the ideal which is defined by l.
+GroebnerViaFunctionals( const idealFunctionals & l,
+                        fglmVector iv = fglmVector() )
+// If iv is zero, calculates the groebnerBasis for the ideal which is
+// defined by l.
+// If iv is not zero, then the groebnerBasis if i:p is calculated where
+// i is defined by l and iv is the vector-representation of nf(p) wrt. i
 // The dimension of l has to be finite.
 // The result is in reduced form.
@@ -982 +1012 @@
     fglmDdata data( l.dimen() );
 
-    // insert pOne() and update workinglist:
+    // insert pOne() and update workinglist according to iv:
+    fglmVector initv;
+    if ( iv.isZero() ) {
+      // STICKYPROT("initv is zero\n");
+      initv = fglmVector( l.dimen(), 1 );
+    }
+    else {
+      // STICKYPROT("initv is not zero\n");
+      initv = iv;
+    }
+      
     poly one = pOne();
-    data.updateCandidates( one, fglmVector(l.dimen(), 1) );
+    data.updateCandidates( one, initv );
     number nOne = nInit( 1 );
-    data.newBasisElem( one, fglmVector( l.dimen(), 1 ), fglmVector( 1, 1 ), nOne );
+    data.newBasisElem( one, initv, fglmVector( 1, 1 ), nOne );
     STICKYPROT( "." );
     while ( data.candidatesLeft() == TRUE ) {
@@ -1113 +1153 @@
 
 BOOLEAN
+fglmquot( ideal sourceIdeal, poly quot, ideal & destIdeal)
+{
+    BOOLEAN fglmok;
+    fglmVector v;
+
+    idealFunctionals L( 100, pVariables );
+    // STICKYPROT("calculating normal form\n");
+    // poly p = kNF( sourceIdeal, currRing->qideal, quot );
+    // STICKYPROT("calculating functionals\n");
+    fglmok = CalculateFunctionals( sourceIdeal, L, quot, v );
+    if ( fglmok == TRUE ) {
+      // STICKYPROT("calculating groebner basis\n");
+        destIdeal= GroebnerViaFunctionals( L, v );
+    }
+    return fglmok;
+}
+
+BOOLEAN
 FindUnivariateWrapper( ideal source, ideal & destIdeal )
 {