Changeset 6123d46 in git

Timestamp:

Dec 7, 2009, 3:22:41 PM (13 years ago)

Author:

Martin Monerjan

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

561aa20d93487cb95c506fc3281c4720f466070c

Parents:

a23a297b3ce46de66672d1b0f7796e93c2ccb4de

Message:

fixed dPolyErrors
ring reconstruction in lprepareList


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

File:

• kernel/gfan.cc (modified) (8 diffs)

kernel/gfan.cc

@@ -64 +64 @@
 
 #ifndef gfan_DEBUG
-// #define gfan_DEBUG 1
+// #define gfan_DEBUG
 #ifndef gfan_DEBUGLEVEL
 #define gfan_DEBUGLEVEL 1
@@ -406 +406 @@
         this->pred=gc.UCN;
         this->facetPtr=NULL;
-        this->gcBasis=idCopy(f.flipGB);
-//      ring saveRing=currRing;
-//      rChangeCurrRing(gc.baseRing);
-//      this->gcBasis=idCopy(f.flipGB);
+//      this->gcBasis=idCopy(f.flipGB);
+//      ring saveRing=currRing;
+//      ring tmpRing=f.flipRing;
+//      rComplete(f.flipRing);
+//      rChangeCurrRing(f.flipRing);
+        this->gcBasis=idrCopyR(f.flipGB, f.flipRing);
 //      this->inputIdeal=idCopy(this->gcBasis);
         this->baseRing=rCopy(f.flipRing);
-//      rChangeCurrRing(saveRing);
+//      rComplete(this->baseRing);
+//      rChangeCurrRing(saveRing);
         this->numFacets=0;
         this->ivIntPt=NULL;
@@ -1334 +1337 @@
         int size=IDELEMS(H);
         ideal res=idInit(size,1);
-        poly temp1=pInit();
-        poly temp2=pInit();
-        poly temp3=pInit();     //polys to temporarily store values for pSub
+        poly temp1;//=pInit();
+        poly temp2;//=pInit();
+        poly temp3;//=pInit();  //polys to temporarily store values for pSub
         for (int ii=0;ii<size;ii++)
         {
@@ -1777 +1780 @@
                                         pDelete(&gcTmp->gcBasis->m[ii]);
                                 }
-//                              idDelete((ideal*)&gcTmp->gcBasis);
-//                              rDelete(gcTmp->baseRing);
+//                              idDelete((ideal*)&gcTmp->gcBasis);//Whonder why?
+//                              rDelete(gcTmp->baseRing);
                         }                       
-#if gfan_DEBUG
-                        if(SearchListRoot!=NULL)
-                                gcTmp->showSLA(*SearchListRoot);
-#endif
+// #ifdef gfan_DEBUG
+//                      if(SearchListRoot!=NULL)
+//                              gcTmp->showSLA(*SearchListRoot);
+// #endif
                         rChangeCurrRing(gcAct->baseRing);
                         //rDelete(rTmp);
@@ -2335 +2338 @@
         
         ring saveRing=currRing; 
-        rChangeCurrRing(gc->baseRing);
-        ring newRing;   //The ring to be read in
-        
-        string::iterator EOL;
-        int terms=1;    //#Terms in the poly
+        //Comment the following if you uncomment the if(line=="RING") part below
+        rChangeCurrRing(gc->baseRing);
+//      string::iterator EOL;
+//      int terms=1;    //#Terms in the poly
         
         while( !gcInputFile.eof() )
@@ -2349 +2351 @@
                 if(line=="RING")
                 {
-                        /*getline(gcInputFile,line);
-                        found = line.find("a(");
-                        line.erase(0,found+2);
-                        string strweight;
-                        strweight=line.substr(0,line.find_first_of(")"));
-                        intvec *iv=new intvec(this->numVars);
-                        for(int ii=0;ii<this->numVars;ii++)
-                        {
-                                string weight;
-                                weight=line.substr(0,line.find_first_of(",)"));                         
-                                (*iv)[ii]=atoi(weight.c_str());
-                                line.erase(0,line.find_first_of(",)")+1);
-                        }
-                        ring newRing;
-                        newRing=rCopy0(currRing);
-                        int length=this->numVars;
-                        int *A=(int *)omAlloc0(length*sizeof(int));
-                        for(int jj=0;jj<length;jj++)
-                        {
-                                A[jj]=-(*iv)[jj];
-                        }
-                        omFree(newRing->wvhdl[0]);
-                        newRing->wvhdl[0]=(int*)A;
-                        newRing->block1[0]=length;
-                        rComplete(newRing);
-                        baseRing=rCopy(newRing);*/                      
+//                      getline(gcInputFile,line);
+//                      found = line.find("a(");
+//                      line.erase(0,found+2);
+//                      string strweight;
+//                      strweight=line.substr(0,line.find_first_of(")"));
+//                      intvec *iv=new intvec(this->numVars);
+//                      for(int ii=0;ii<this->numVars;ii++)
+//                      {
+//                              string weight;
+//                              weight=line.substr(0,line.find_first_of(",)"));                         
+//                              (*iv)[ii]=atoi(weight.c_str());
+//                              line.erase(0,line.find_first_of(",)")+1);
+//                      }
+//                      ring newRing;
+//                      if(currRing->order[0]!=ringorder_a)
+//                      {
+//                              newRing=rCopyAndAddWeight(currRing,iv);
+//                      }
+//                      else
+//                      {                       
+//                              newRing=rCopy0(currRing);
+//                              int length=this->numVars;
+//                              int *A=(int *)omAlloc0(length*sizeof(int));
+//                              for(int jj=0;jj<length;jj++)
+//                              {
+//                                      A[jj]=-(*iv)[jj];
+//                              }
+//                              omFree(newRing->wvhdl[0]);
+//                              newRing->wvhdl[0]=(int*)A;
+//                              newRing->block1[0]=length;
+//                      }
+//                      delete iv;
+//                      rComplete(newRing);
+//                      gc->baseRing=rCopy(newRing);
+//                      if(currRing!=gc->baseRing)
+//                              rChangeCurrRing(gc->baseRing);
                 }
+                
                 if(line=="GCBASISLENGTH")
                 {
@@ -2382 +2395 @@
                         int size=atoi(strGcBasisLength.c_str());
                         gcBasisLength=size;             
-                        gcBasis=idInit(size,1);
+                        gc->gcBasis=idInit(size,1);
                 }
                 if(line=="GCBASIS")
@@ -2524 +2537 @@
 //              ring tmpRing=gcAct->getBaseRing;
 //              rChangeCurrRing(tmpRing);
-                l->m[1].data=(void*)idrCopyR_NoSort(gcAct->gcBasis,gcAct->getBaseRing());
+//              l->m[1].data=(void*)idrCopyR_NoSort(gcAct->gcBasis,gcAct->getBaseRing());
+                l->m[1].data=(void*)idrCopyR(gcAct->gcBasis,gcAct->getBaseRing());
 //              rChangeCurrRing(saveRing);