Changeset 305057 in git

Timestamp:

Nov 27, 2010, 11:52:21 AM (13 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

97939e5ee5fff70c24cb3d9f9582523bf3efaf60

Parents:

43317d7c168dc7963686b32ca4150c8777e93843

Message:

grcone to compute a single cone. Needs wp ordering. Just a wrapper to call gfan in a special way. 
gfan has new third parameter which is by default FALSE
removed two cddlib frees in getConeNormals


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

Files:

• Singular/extra.cc (modified) (2 diffs)
• kernel/gfan.cc (modified) (7 diffs)
• kernel/gfan.h (modified) (2 diffs)

Singular/extra.cc

@@ -3610 +3610 @@
       ideal I=((ideal)h->Data());
       res->rtyp=LIST_CMD;
-      res->data=(lists) gfan(I,heuristic);
+      res->data=(lists) gfan(I,heuristic,FALSE);
       return FALSE;
     }
@@ -3619 +3619 @@
     }
   }
+  //Possibility to have only one Gröbner cone computed by specifying a weight vector FROM THE RELATIVE INTERIOR!
+  //Needs wp as ordering!
+  if(strcmp(sys_cmd,"grcone")==0)
+  {
+    if(h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
+    {
+      ideal I=((ideal)h->Data());
+      res->rtyp=LIST_CMD;
+      res->data=(lists)grcone_by_intvec(I);
+    }
+  }
   else
+    
 #endif
 /*==================== Error =================*/

kernel/gfan.cc

@@ -20 +20 @@
 //#include "fast_maps.h"        //Mapping of ideals
 // #include "maps.h"
-// #include "ring.h"    //apparently not needed
+#include "ring.h"       //apparently not needed
 // #include "structs.h"
 #include <Singular/lists.h>
@@ -1207 +1207 @@
         }       
         //Clean up but don't delete the return value!   
-        dd_FreeMatrix(ddineq);  
+        //dd_FreeMatrix(ddineq);        
         set_free(ddredrows);//check
         set_free(ddlinset);//check
-        free(ddnewpos);//<-- NOTE Here the crash occurs omAlloc issue?
+        //free(ddnewpos);//<-- NOTE Here the crash occurs omAlloc issue?
 #ifdef gfanp
         gettimeofday(&end, 0);
@@ -1708 +1708 @@
         t_getExtremalRays += (end.tv_sec - start.tv_sec + 1e-6*(end.tv_usec - start.tv_usec));
 #endif  
-}               
+}
+
+/** Order the spanning rays in a lex way hopefully using qsort()*/
+void gcone::orderRays()
+{
+//   qsort(gcRays,sizeof(int64vec),int64vec::compare);
+}
         
 inline bool gcone::iv64isStrictlyPositive(const int64vec * iv64)
@@ -1723 +1729 @@
         return res;
 }
-        
+
 /** \brief Compute the Groebner Basis on the other side of a shared facet 
  *
@@ -4413 +4419 @@
 int64vec *gcone::ivZeroVector;
 // ideal gfan(ideal inputIdeal, int h)
-lists gfan(ideal inputIdeal, int h)
+/** Main routine 
+ * The first and second parameter are mandatory. The third (and maybe fourth) parameter is for Janko :)
+ */
+lists gfan(ideal inputIdeal, int h, bool singleCone=FALSE)
 {
         lists lResList; //this is the object we return  
@@ -4471 +4480 @@
                         gcone::dd_LinealitySpace = gcAct->computeLinealitySpace();
                         gcAct->getExtremalRays(*gcAct);
-                        gcAct->noRevS(*gcAct);  //Here we go!
+                        if(singleCone==FALSE)//Is Janko here?
+                        {//Compute the whole fan
+                          gcAct->noRevS(*gcAct);        //Here we go!
+                        }                           
                         //Switch back to the ring the computation was started in
 //                      rChangeCurrRing(inputRing);
@@ -4550 +4562 @@
 }
 
-#endif
+/** Compute a single Gröbner cone by specifying an ideal and a weight vector.
+ * NOTE: We do NOT check whether the vector is from the relative interior of the cone.
+ * That is upon the user to assure.
+ */
+lists grcone_by_intvec(ideal inputIdeal)
+{
+  if( (rRingOrder_t)currRing->order[0] == ringorder_wp)
+  {
+    lists lResList;
+    lResList=gfan(inputIdeal, 0, TRUE);
+  }
+  else
+    WerrorS("Need wp ordering");
+}
+#endif

kernel/gfan.h

@@ -23 +23 @@
 extern int gfanHeuristic;
 
-lists gfan(ideal inputIdeal, int heuristic);
+lists gfan(ideal inputIdeal, int heuristic, bool singleCone);
+lists grcone_by_intvec(ideal inputIdeal);
 
 class facet
@@ -223 +224 @@
                 void getCodim2Normals(const gcone &gc);
                 void getExtremalRays(const gcone &gc);
+                void orderRays();
                 void flip(ideal gb, facet *f);
                 void flip2(const ideal &gb, facet *f);