Changeset f13c85 in git

Timestamp:

May 28, 2015, 2:12:00 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

75fdcae64006ce0ba10e3d881e761f661f4fc9ea

Parents:

9750e3ed7db2557ee2bc1ca59771e04ecff78d78

Message:

format, cleanup, def. of map/sip_map at one place, ....

Files:

• Singular/ipshell.cc (modified) (2 diffs)
• Singular/maps_ip.cc (modified) (2 diffs)
• kernel/combinatorics/hdegree.cc (modified) (8 diffs)
• kernel/combinatorics/hilb.cc (modified) (1 diff)
• kernel/ideals.cc (modified) (4 diffs)
• kernel/preimage.h (modified) (1 diff)
• libpolys/polys/monomials/maps.h (modified) (1 diff)
• libpolys/polys/simpleideals.h (modified) (1 diff)

Singular/ipshell.cc

@@ -68 +68 @@
 #include <math.h>
 #include <ctype.h>
-#include <algorithm>
 
 // define this if you want to use the fast_map routine for mapping ideals
@@ -782 +781 @@
         {
           v->rtyp=IDEAL_CMD;
-          
-          char *tmp = (char*)1;
-          std::swap(tmp, theMap->preimage); // map gets 1 as its rank (as an ideal)
-          v->data=fast_map(IDIDEAL(w), src_ring, (ideal)theMap, currRing); // FIXME: this dirty hack from original Singular!
-          std::swap(tmp, theMap->preimage); // map gets its preimage back
-          assume( tmp == (char*)1 );
-          
+          char *tmp = theMap->preimage;
+          theMap->preimage=(char*)1L;
+          // map gets 1 as its rank (as an ideal)
+          v->data=fast_map(IDIDEAL(w), src_ring, (ideal)theMap, currRing);
+          theMap->preimage=tmp; // map gets its preimage back
         }
         else

Singular/maps_ip.cc

@@ -43 +43 @@
 #include <polys/monomials/maps.h>
 #endif
-
-#include <algorithm>
 
 /*2
@@ -392 +390 @@
     ideal src_id=idInit(1,1);
     src_id->m[0]=p;
-    
-    char *tmp = (char*)1;
-    std::swap(tmp, theMap->preimage); // map gets 1 as its rank (as an ideal)
-    ideal res_id=fast_map(src_id,currRing,(ideal)theMap,currRing); // FIXME: this dirty hack from original Singular!
-    std::swap(tmp, theMap->preimage); // map gets its preimage back
-    assume( tmp == (char*)1 );
-    
+
+    char *tmp = theMap->preimage;
+    theMap->preimagei=(char*)1L; // map gets 1 as its rank (as an ideal)
+    ideal res_id=fast_map(src_id,currRing,(ideal)theMap,currRing);
+    theMap->preimage=tmp; // map gets its preimage back
+
     res=res_id->m[0];
     res_id->m[0]=NULL; idDelete(&res_id);

kernel/combinatorics/hdegree.cc

@@ -74 +74 @@
   id_Test(S, currRing);
   if( Q!=NULL ) id_Test(Q, currRing);
-  
+
   int  mc;
   hexist = hInit(S, Q, &hNexist, currRing);
@@ -214 +214 @@
   id_Test(S, currRing);
   if( Q!=NULL ) id_Test(Q, currRing);
-  
+
   intvec *Set=new intvec((currRing->N));
   int  mc,i;
@@ -700 +700 @@
   id_Test(S, currRing);
   if( Q!=NULL ) id_Test(Q, currRing);
-  
+
   int  di;
   int  mc;
@@ -801 +801 @@
   id_Test(S, currRing);
   if( Q!=NULL ) id_Test(Q, currRing);
-  
+
   hDegree(S, Q);
   return hMu;
@@ -824 +824 @@
   id_Test(S, currRing);
   if( Q!=NULL ) id_Test(Q, currRing);
-  
+
   int co, mu, l;
   intvec *hseries2;
@@ -921 +921 @@
   id_TestTail(S, currRing, tailRing);
   if (Q!=NULL) id_TestTail(Q, currRing, tailRing);
-  
+
   hDegree0(S, Q, tailRing);
   return hMu;
@@ -1007 +1007 @@
   id_TestTail(S, currRing, tailRing);
   if (Q!=NULL) id_TestTail(Q, currRing, tailRing);
-  
+
   int  i;
   int  k = ak;
@@ -1341 +1341 @@
 {
   if( Q!=NULL) id_Test(Q, currRing);
-  
+
   int  i, di;
   poly p;

kernel/combinatorics/hilb.cc

@@ -1299 +1299 @@
 intvec * hFirstSeries(ideal S, intvec *modulweight, ideal Q, intvec *wdegree, ring tailRing)
 {
-  id_TestTail(S, currRing, tailRing);  
+  id_TestTail(S, currRing, tailRing);
   if (Q!= NULL) id_TestTail(Q, currRing, tailRing);
-  
+
   return hSeries(S, modulweight, 1, wdegree, Q, tailRing);
 }

kernel/ideals.cc

@@ -1788 +1788 @@
 ideal idMinors(matrix a, int ar, ideal R)
 {
- 
+
   const ring origR=currRing;
   id_Test((ideal)a, origR);
@@ -1794 +1794 @@
   const int r = a->nrows;
   const int c = a->ncols;
-  
+
   if((ar<=0) || (ar>r) || (ar>c))
   {
@@ -1800 +1800 @@
     return NULL;
   }
-  
-  ideal h = id_Matrix2Module(mp_Copy(a,origR),origR);  
+
+  ideal h = id_Matrix2Module(mp_Copy(a,origR),origR);
   long bound = sm_ExpBound(h,c,r,ar,origR);
   id_Delete(&h, origR);
-  
+
   ring tmpR = sm_RingChange(origR,bound);
-  
+
   matrix b = mpNew(r,c);
-  
+
   for (int i=r*c-1;i>=0;i--)
     if (a->m[i] != NULL)
       b->m[i] = prCopyR(a->m[i],origR,tmpR);
-  
+
   id_Test( (ideal)b, tmpR);
-  
+
   if (R!=NULL)
   {
@@ -1826 +1826 @@
     id_Test( R, tmpR);
   }
-  
-  
+
+
   ideal result = idInit(32,1);
 
   int elems = 0;
-  
+
   if(ar>1)
     mp_RecMin(ar-1,result,elems,b,r,c,NULL,R,tmpR);
   else
     mp_MinorToResult(result,elems,b,r,c,R,tmpR);
-  
+
   id_Test( (ideal)b, tmpR);
-  
+
   id_Delete((ideal *)&b, tmpR);
-  
+
   if (R!=NULL) idDelete(&R);
-  
+
   idSkipZeroes(result);
   rChangeCurrRing(origR);

kernel/preimage.h

@@ -2 +2 @@
 #define KERNEL_PREIMAGE_H
 
-struct ip_sring; typedef struct ip_sring * ring;
-struct sip_sideal; typedef struct sip_sideal * ideal;
-struct sip_smap; typedef struct sip_smap *          map;
+#include <polys/monomials/ring.h>
 
 ideal maGetPreimage(ring theImageRing, map theMap, ideal id, const ring dst_r);

libpolys/polys/monomials/maps.h

@@ -9 +9 @@
 #include <coeffs/coeffs.h>
 #include <polys/monomials/ring.h>
-//#include <polys/simpleideals.h>
-
-struct sip_smap; typedef struct sip_smap *         map;
 
 // poly maEval(map theMap, poly p, ring dst_ring, nMapFunc nMap, ideal s=NULL);

libpolys/polys/simpleideals.h

@@ -43 +43 @@
 };
 
-typedef struct sip_smap *         map;
+//typedef struct sip_smap *         map;
 
 struct sideal_list;