Changeset 4b7db8 in git

Timestamp:

Oct 12, 2012, 12:44:08 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e2c21a2830ff139bc7175101732d2b833c240e49

Parents:

7ec05993a90b8b8d6cd1f03ce111460365a98194

Message:

fix: how to build ring from lists without order for components (rCompose)

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (3 diffs)
• Tst/Manual/setglobalrings.res.gz.uu (modified) (1 diff)
• Tst/Manual/setglobalrings.stat (modified) (1 diff)

Singular/iparith.cc

@@ -81 +81 @@
 #include <polys/coeffrings.h>
 
-lists rDecompose(const ring r); ring rCompose(const lists  L);
+lists rDecompose(const ring r);
+ring rCompose(const lists  L, const BOOLEAN check_comp=TRUE);
 
 

Singular/ipshell.cc

@@ -2130 +2130 @@
 }
 
-ring rCompose(const lists  L)
+ring rCompose(const lists  L, const BOOLEAN check_comp)
 {
   if ((L->nr!=3)
@@ -2208 +2208 @@
       if( R->cf == NULL )
       {
-        ring extRing = rCompose((lists)L->m[0].Data());
+        ring extRing = rCompose((lists)L->m[0].Data(),FALSE);
 
         if (extRing==NULL)
@@ -2449 +2449 @@
         Werror("ordering incomplete: size (%d) should be %d",R->block1[j],R->N);
         goto rCompose_err;
+      }
+    }
+    if (check_comp)
+    {
+      BOOLEAN comp_order=FALSE;
+      int jj;
+      for(jj=0;jj<n;jj++)
+      {
+        if ((R->order[jj]==ringorder_c) ||
+            (R->order[jj]==ringorder_C)) { comp_order=TRUE; break; }
+      }
+      if (!comp_order)
+      {
+        R->order=(int*)omRealloc0Size(R->order,n*sizeof(int),(n+1)*sizeof(int));
+        R->block0=(int*)omRealloc0Size(R->block0,n*sizeof(int),(n+1)*sizeof(int));
+        R->block1=(int*)omRealloc0Size(R->block1,n*sizeof(int),(n+1)*sizeof(int));
+        R->wvhdl=(int**)omRealloc0Size(R->wvhdl,n*sizeof(int_ptr),(n+1)*sizeof(int_ptr));
+        R->order[n-1]=ringorder_C;
+        R->block0[n-1]=0;
+        R->block1[n-1]=0;
+        R->wvhdl[n-1]=NULL;
+        n++;
       }
     }

Tst/Manual/setglobalrings.res.gz.uu

@@ -1 @@
-begin 640 setglobalrings.res.gz
-M'XL("*9?<DX``W-E=&=L;V)A;')I;F=S+G)E<P"]4M%*PS`4?>]77(8/+81N
-MZYS*BD74EX&(;+Y+TM8:3).29'/=UWO3=MU0H>S%^]+;<VY.SKED_?JX?`:`
-M:0)/RWL866-#P=DH!NS>N.36#V+/?2%)P.2V$(I1H;DL3"CSK]!8:KUUIQ)U
-M*H56+%7;5JEG9PFX<["Z]2>$$A80?T=JL@](5AVG+G]>XPP<R'D"=ZO8&X^Q
-M3S^HIJG--3>6I["`28M'4"%1YLC@'^(4&+14R66E1`U=]4?DIF0XK=YA2[5!
-M?-;B33&ATD^W(L25SO(F0U:=3!QK`1)O-J[=00W[/V2B4YF'/MD5)GL92/;+
-L9C1D4PS:Q.7T'J[==L\V,?^G79V7Y29I7K![GAOC3X/XPOL&T6//\NP"````
+begin 644 setglobalrings.res.gz
+M'XL("-OS=U```W-E=&=L;V)A;')I;F=S+G)E<P"]4]%.@S`4?><K;A8?(&G8
+M!D[-B(U17Y888S;?30N(C:4E;3?'OMX6&%MT">J#]X7+.;>GY]S`ZOE^\0@`
+M4PP/BUL8&6U"SN@H`=N],,&,'R2>>P+&H'-3<$D)5TP4.A3Y1Z@-,=ZJ4XDZ
+ME4))FLI-J]2S,09W#I;7_@011`/D;U&-=@'*JL/4^==KG($].<-PLTR\\=CV
+MZ1M1)#6Y8MJP%.8P:?$(*DN4N67LF\4)4&BIDHE*\AJZZH^(=4GMM'R%#5':
+MXG&+-T6Y3-_=BBPN598W&;+J:.)0<Q#V9NW:+=2P.R$3'<O<]<DN;+*G@63?
+M;$9#-OF@3;N<GYN\=.O_M<O9/RWSKV'CTV&O</,/N`]\K?UID)QYGX?O8&0N
+#`P``
 `
 end

Tst/Manual/setglobalrings.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:260384
-1 >> tst_memory_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:666332
-1 >> tst_memory_2 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:699116
-1 >> tst_timer_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:14
+1 >> tst_memory_0 :: 1350038491:3150:3-1-5:ix86-Linux:mamawutz:263036
+1 >> tst_memory_1 :: 1350038491:3150:3-1-5:ix86-Linux:mamawutz:2239256
+1 >> tst_memory_2 :: 1350038491:3150:3-1-5:ix86-Linux:mamawutz:2272040
+1 >> tst_timer_1 :: 1350038491:3150:3-1-5:ix86-Linux:mamawutz:6