Changeset db61bce in git

Timestamp:

Jun 6, 2014, 3:47:10 PM (9 years ago)

Author:

Jakob Kröker <kroeker@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

4c0c4a37de4da7bacc5bab644b0efe4197b564e9

Parents:

d7295ff2c24f0d2b03594917a387c981bd47eedd

Message:

handling nonredundant primary decompositions in primDecsAreEquivalent-test

Files:

• Singular/LIB/ehv.lib (modified) (2 diffs)
• Tst/Short/libehv_s.res.gz.uu (modified) (1 diff)
• Tst/Short/libehv_s.stat (modified) (1 diff)
• Tst/Short/libehv_s.tst (modified) (2 diffs)

Singular/LIB/ehv.lib

@@ -1366 +1366 @@
 //                                                                 //
 /////////////////////////////////////////////////////////////////////
-
+proc removeRedundantComponents(list primdecResult)
+"USAGE:   removeRedundantComponents(L); L a primary decomposition 
+RETURN:  an irredundant primary decomposition.
+EXAMPLE: example removeRedundantComponents; shows an example"
+proc removeRedundantComponents(list primdecResult)
+{
+   int i,j;
+
+   i = 1;
+   j = 1;
+   while  ( i<=size(primdecResult) ) 
+   {  
+     ASSUME(1, i>0 &&  i<=size(primdecResult) );
+     ASSUME(1, j>0 &&  j<=size(primdecResult) );
+
+      if (i!=j)
+      {
+          if ( isSubset( std(primdecResult[j][1]) , std(primdecResult[i][1]) ) )
+          { 
+              primdecResult[i] =  primdecResult[j];
+              primdecResult = delete(primdecResult,j);
+              j = j - 1; /*correct j due to deletion */
+              if ( j<i )  {    i = i -1;   } /*correct i */
+          }
+      } 
+      j = j + 1;
+      if ( j > size(primdecResult) )
+      {
+         i = i + 1;
+         j = 1;
+      }
+   }
+
+   return (primdecResult);
+}
+example
+{
+  "EXAMPLE:";
+  ring rng = 0,(x,y),dp;
+  def L1 = list(list(ideal(x-1),ideal(x-1)),list(ideal(x-1),ideal(x-1)),list(ideal(y-2),ideal(y-2)));
+  def L2 = list(list(ideal(x-1),ideal(x-1)),list(ideal(y-2),ideal(y-2)));
+  L1;
+  L2;
+  ASSUME(0, primDecsAreEquivalent( L1, L2 ) );
+}
 
 /////////////////////////////////////////////////////////////////////
@@ -1374 +1418 @@
 EXAMPLE: example primDecsAreEquivalent; shows an example"
 {
+  L = removeRedundantComponents(L);
+  K = removeRedundantComponents(K);
   int s1 = size(L);
   int s2 = size(K);

Tst/Short/libehv_s.res.gz.uu

@@ -1 +1 @@
 begin 644 libehv_s.res.gz
-M'XL("!PS]U(``VQI8F5H=E]S+G)E<P"EDU%KPC`0Q]_]%(?LH842F[3KA&+!
-MH0]"-P;=GL:0JG$+U.J:Z&1CWWU7E6NK<R`KE"3-_W_WNRN7/`Y&]P#`(XA'
-MM]`VVK!,3=IA*SG<B`CPXUCEREAVV"I7B")`D7S;C#7+Y0?3)C5D\"*@O<_*
-ML%8;I;NP=A7WNB8+&*R*Y12,U.:A4(N!G.I^(8?O:[5),YEC9M+>,/BB0Y=!
-M^10J?X4"WQZXX&R=V8KR<'<OR90V$','8E'="48,W-_K.IT=!6<P4_.Y+#`Y
-M:/4I-0F#O3#FS_P%$Y:!+5`SF6:6:SNT`ZB*Y0?.?I(\W0TMUT',7@]K_JU4
-MA(R%77,+MX&&T#I=R!V5`Y.UJ9%.E[G!E9SBP"I.63FQ\@:K\*NFB.!?W-TJ
-MDM>LP6,@R7E,[8G+.^SYY!''GBUYMDU/<+X[9SU=\ISD.<?FN\==Y!=TT<=N
-F?-.A-EP^EOS'P%0!:I/F8\GE-)<#N];XYT.X"EL_&QXISP4$````
+M'XL(",C%D5,``VQI8F5H=E]S+G)E<P"E5EUOVD`0?,^O6*$^V,0XOO.W$$AI
+M$U5(M*H@?6E5(@=?6DM@J.^@AJK_O7M'<CY(24/[@'W&L[NS,^NSQS=7@_<`
+M0/HP'+R&EN#"G15WK>[9^.$.[0/^>5N4A;#L[ID\0[\/"&+?UK?<+=D/EXM,
+MZ`"_#WH=N#*MU4*H2FLW>4,#%KFPK!93$(R+$9LOUFS$\E4ILC)_LY@O%R4K
+M!;=LC8]=^*DO$A</55%^A0I_/?`<JW8VMI,O=3'B24S.[F%($#$KN+#4@8O<
+M*G*6S:RZ0VS;,=>G`C8=J@%JW31+J*Y/_[7^<^D#G5[U5S42YEDI#`F'Q(B*
+M9-3E>/SQW;7E.<"++;,P@=WK40.5[*.653&_8E-^6;'K[ZMBG<TPL86Z.K(W
+M&YI(BJ+KM1*`;[A@<ZM5H:^+><M!XA[Q4AH$L1$6F'Y*N:@O'86-`UO;`<-6
+MJCI0DL``@6F[;F\FM$,(+K83B@7D:B/7YT&[GM#VUH&.CZ#P'!$=XLF;3;ZD
+M8>RKD9$>R-Z&F`NET4B?&DBM_DB2D(Y565Y,T:>!89(?&2%*5.65U#-GT[<W
+MGZS1H$$'JKR:EF,()>DIA@?!4<,C`Q6]S'#E.#$-#UXZ*O!D5D)L]Y>^(,W6
+M$%)C:_CPQX1Z6PA]8UL(5;/[&P,XM;DKA-$.\F@RDFKN&:,0>3O<Q85B05S(
+MB_M[5F%QI2'70+H##LEG\N7Q.=_-I^7AZ#ZNP.@\>N#9R.9!KW=$.S6)IFY1
+MM$<-Z_-LSA0K!^Y6PF`Z790"SSHR>>!*GW(EFBO9XQH;3W1,_X=W'!B9]GM`
+M$YF./&0=)Z<KG'@ZAA[&U#JFWH^AQ]4Y&A/HF"=UCG*+#E4D)ZB8&$.:JB[U
+ME;$_I8'Q;*7&:S?%XG]YX^I2:=Q_[A%L<(F1/W75IX/\.EAQG*4NO.J>_08`
+'#@[Y<@@`````
 `
 end

Tst/Short/libehv_s.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1391932188:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:252836
-1 >> tst_memory_1 :: 1391932188:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:2240508
-1 >> tst_memory_2 :: 1391932188:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:2281480
-1 >> tst_timer_1 :: 1391932188:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:8
+1 >> tst_memory_0 :: 1402062280:4.0.0, 64 bit:4.0.0:x86_64-Linux:andromeda.math.uni-hannover.de:910512
+1 >> tst_memory_1 :: 1402062280:4.0.0, 64 bit:4.0.0:x86_64-Linux:andromeda.math.uni-hannover.de:2650112
+1 >> tst_memory_2 :: 1402062280:4.0.0, 64 bit:4.0.0:x86_64-Linux:andromeda.math.uni-hannover.de:2760704
+1 >> tst_timer_1 :: 1402062280:4.0.0, 64 bit:4.0.0:x86_64-Linux:andromeda.math.uni-hannover.de:21

Tst/Short/libehv_s.tst

@@ -3 +3 @@
 
 LIB("ehv.lib");
+
+proc testRemoveReduntandComponents()
+{
+  ring rng = 0,(x,y),dp;
+  def L1 = list(list(std(ideal(x-1)),ideal(x-1)),list(std(ideal(x-1)),ideal(x-1)),list(std(ideal(y-2)),ideal(y-2)));
+  def L2 = list(list(std(ideal(x-1)),ideal(x-1)),list(std(ideal(y-2)),ideal(y-2)));
+  def LL1 = removeRedundantComponents(L1);
+  ASSUME(0, size(LL1)==2);
+  ASSUME(0, primDecsAreEquivalent( L1, L2 ) );
+
+  system("random", 1401092447);
+  ring rng2 = 23,(x, y, z), dp;
+  ideal I = 9*x*y^2-11*x*z^2, 11*x*y*z^2+4*x^2*z, -3*y^5+x*z-10*y*z;
+
+  list L1,L2, LL1;
+
+  def RI = std(radical(I));
+
+  L1 = primdecGTZ(RI);
+  L2 = primdecGTZ(RI);
+  LL1 = removeRedundantComponents(L1);
+  ASSUME(0, size(LL1)==6);
+  ASSUME(0, primDecsAreEquivalent( LL1, L1) );
+  ASSUME(0, primDecsAreEquivalent( L1 , L2 ) );
+}
 
 proc testPrimDecsAreEquivalent()
@@ -23 +48 @@
     L2[2] = list( ideal(0), ideal(0)  );
     ASSUME(0, 1 == primDecsAreEquivalent(L1,L2) );
+
+  
+
 }
 
+testRemoveReduntandComponents();
 testPrimDecsAreEquivalent();