Changeset fcf7587 in git

Timestamp:

Jun 22, 2011, 5:34:47 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

f152c5a55feb4bb8f254f8c34262507cbe3c16f7

Parents:

c8c436dbaac87cb32807b78b08f51c4be97ab9f1

Message:

switched on new factorization and updated tests


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

Files:

• Tst/Buch/Example_B_7_5.res.gz.uu (modified) (1 diff)
• Tst/Buch/Example_B_7_5.stat (modified) (1 diff)
• Tst/Short/bug_33.res.gz.uu (modified) (2 diffs)
• Tst/Short/bug_33.stat (modified) (1 diff)
• Tst/Short/bug_38.res.gz.uu (modified) (2 diffs)
• Tst/Short/bug_38.stat (modified) (1 diff)
• factory/cf_factor.cc (modified) (4 diffs)
• kernel/clapsing.cc (modified) (1 diff)

Tst/Buch/Example_B_7_5.res.gz.uu

@@ -1 @@
-begin 640 Example_B_7_5.res.gz
-M'XL("'HZN$T``T5X86UP;&5?0E\W7S4N<F5S`.V446^;,!#'W_D4IVA2[4)H
-M[$#3+(*':)M4:=K#TK<I16YB&DL4HM@923Y]ST"`+-JTO0\>.-_=_\YG_\3B
-MZ=/C-P!@,7Q]G,/`:.-GZF4P<Q9-A,>`SD3ERA`Z<^P7XA@^'\3;-I/)/)DD
-MH9_+TM=&F%8UCJ&U`Q_N[B#ZBP=D717F_L0/?R=I"X=^U^3>MP,,Q(M.Q:J9
-M`;KPI+>?!Q]V*G^%[RP:>>3@':FWWG8#3V/8%MD1TH@<N'OD]'E\2P[CR@K1
-M"MR`/O,VGXUB6,L4%@PB[/X%NQ<[=9(DQ=-R</";OO<&5CLIC%R#J#;A@<JA
-MW*C5!AV9T@8PN\CV1B9II=%`S$;:.N<`-`$*2H-&2ZY]&W\J0*Q64FM`05VK
-M2*]4'ICC5@)1:966BS<)"RB%!J&U>LWEVM8R117=2;/?Y?!39'M)/SK0/%H:
-MNW>RH+.K[<[:<V;(5)O):'=@2-25ROG!EE6#!(V(U19?1@>7#`6ME^/+9;",
-MAK@6]/98.T*,VVMR4%C58A['=^R%#FJ[ZN1<@5N;#[EP>=<"/6[/$]0>1ML>
-M5H[NNL.TG:I'/`O.A/&&,._DE1>4L?`7RMP3XL7=,NA2[ANP^'^P+L&:],#B
-M/;`>_@6LYM`K@,H^,^R/M%@2SK?/V\[3[O+YR*]^F/9WN-<$P?_@O`-02R;#
-$9@4`````
+begin 644 Example_B_7_5.res.gz
+M'XL("-SW`4X``T5X86UP;&5?0E\W7S4N<F5S`.V43V^;,!3`[WR*IVA2[4+=
+MV(&F602':)M4:=IA]#:UR`VFL40ABIU!\NEK`P&R:--VGSGP_C\_^R?'CY\>
+MO@$`C>#KPPHF6FF2RY?)THD[#XO`&!-92(WPTK%_B"+X7/.W;2Z253)/`E*(
+MBBC-=9\UBZ"7?0*WMQ#^Q0+15H45F9/@=RE]X8`,3>Z('6#"7U3&U]T,,+CG
+MH_W<$]C)XA6^TW#JH=H[8"_=#@,O(MB6^0&R$-7,/3#\/+M&]:R1`B/YKH^?
+M61]/IQ&D(H.80FBZ?S'=RYT\"I29TW+,X%=CZQ6L=X)KD0)O-N&!+*#:R/7&
+M&'*I-)CH,M]KD61-C@*D-\+6.3F@<V"0"I211$JL_[$$OEX+I<`DM+7*["++
+M`WW8"D`R:\(*_B8@AHHKX$K)UT*DMI8N&^].Z/VN@)\\WPO\T8%N*:'MWE&,
+MEQ?;7?;G3`U3?23%PX$9HBZRG!_TJ6F0&"&DK<2>PMI%-QRWZNQ<]1N5X^M#
+MJP=&M[?DF+RF%/68^69>X)C4H3@Z%6!69C>,NVSH8"SNR.*W%HK['C;=F-L.
+MBWZH$?#4/P'&.L"\HU>=04:#7R!SCX8NYE;^$'+7<<7^<W7.U7S$%1MQ=?\O
+L7'6'W@!4C9FA?Z3%DG"Z?=9W7@R7SZ:D>2_M:[A7R'#_P7D',HVZUV4%````
 `
 end

Tst/Buch/Example_B_7_5.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1303919226:3130- 14004 :3-1-3:ix86-Linux:mamawutz:198632
-1 >> tst_memory_1 :: 1303919226:3130- 14004 :3-1-3:ix86-Linux:mamawutz:753664
-1 >> tst_memory_2 :: 1303919226:3130- 14004 :3-1-3:ix86-Linux:mamawutz:786432
-1 >> tst_timer_1 :: 1303919226:3130- 14004 :3-1-3:ix86-Linux:mamawutz:17
+1 >> tst_memory_0 :: 1308751832:3132- 13777 :3-1-3:ix86-Linux:mamawutz:212540
+1 >> tst_memory_1 :: 1308751832:3132- 13777 :3-1-3:ix86-Linux:mamawutz:677412
+1 >> tst_memory_2 :: 1308751832:3132- 13777 :3-1-3:ix86-Linux:mamawutz:750976
+1 >> tst_timer_1 :: 1308751832:3132- 13777 :3-1-3:ix86-Linux:mamawutz:26

Tst/Short/bug_33.res.gz.uu

@@ -1 @@
-begin 640 bug_33.res.gz
-M'XL("'FK($<``V)U9U\S,RYR97,`;5-+CYLP$+[S*ZQ5#P9CB,?&(8O@4/6R
+begin 644 bug_33.res.gz
+M'XL("`KX`4X``V)U9U\S,RYR97,`;5-+CYLP$+[S*ZQ5#P9CB,?&(8O@4/6R
 M4M7#;F_5)F)W$X24DA6O)OWU'6Q>;5<1X6/\S>N;\=/W+P_?""$B(U\?/I.[
 MMFF#<_ERESA/XPED!(V'LBI;ZB;.\"991EZZXB!E4!U_!4V;MS-=9F3&*EAP
 M%)"ZK`KRF-*-G[L^O?HWUW][7Q+IC/PLJ_?+^9;FP,1RL,W(*7]M+W7Y^TBO
-MBMT4UO%#/-\[>'A`D`J+X#F]`J,\=[T;6).T)FM!@O$1/O[F\/&JXMU890U#
+MBMT4UO%#/-\[>'A`D`J+X#F]`J.YZ]W`6J2U<&M"@O$1/O[F\/&JXMU890U#
 MF;WK=^L2Q68IL=\KUN\E/L#Z5;4"E1P(Y)12L0.OVVL/N1S4!G&$.&(R5B.6
 M3,4(%4+-=GJ$BD?;"0,W#&D<A5(CENZ2$<:,!6:,I)Y3;G4\I>3C@<TY)]+,
@@ -10 +10 @@
 M%!*BGBFTR#D>[H0IMDZ+US=Z\@LWJ1-'F0B3D[1.BJW\(EP"3D]A[7K(W\QV
 MW)J"T^(_^W:9JHB7/10X89P,AVALE@D8%``CM4#CW^("CAQUY=H(;Z=EN$R"
-MA=Q.&9W!.G-EWF#(7K^*A:LQM4U,W_]*&X;H.VQPC^T[:SR%@(]E`/FQ#*`6
-=&0"O8!C.7SHP]WJXO%U#A9M\<OX`&=XRZ`T$````
+MA=Q.&9W!.G-EWF#(7K^*A:LQM4U,W_]*&X;H.^QKC^T[:SR%@(]E`/FQ#*`6
+=&0"O8!C.7SHP]WJXO%U#A9M\<OX`%XLEE@T$````
 `
 end

Tst/Short/bug_33.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1193323385:2007102418:3-0-3:ix86-Linux:nepomuck:185300 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:175828
-1 >> tst_memory_1 :: 1193323385:2007102418:3-0-3:ix86-Linux:nepomuck:707748 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:667336
-1 >> tst_memory_2 :: 1193323385:2007102418:3-0-3:ix86-Linux:nepomuck:707748 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:700120
-1 >> tst_timer_1 :: 1193323385:2007102418:3-0-3:ix86-Linux:nepomuck:6 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:9
+1 >> tst_memory_0 :: 1193323385:2007102418:3-0-3:ix86-Linux:nepomuck:185300 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:175828 1308752065:3132- 13777 :3-1-3:ix86-Linux:mamawutz:176220
+1 >> tst_memory_1 :: 1193323385:2007102418:3-0-3:ix86-Linux:nepomuck:707748 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:667336 1308752065:3132- 13777 :3-1-3:ix86-Linux:mamawutz:667360
+1 >> tst_memory_2 :: 1193323385:2007102418:3-0-3:ix86-Linux:nepomuck:707748 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:700120 1308752065:3132- 13777 :3-1-3:ix86-Linux:mamawutz:700144
+1 >> tst_timer_1 :: 1193323385:2007102418:3-0-3:ix86-Linux:nepomuck:6 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:9 1308752065:3132- 13777 :3-1-3:ix86-Linux:mamawutz:5

Tst/Short/bug_38.res.gz.uu

@@ -1 @@
-begin 640 bug_38.res.gz
-M'XL(".LZN$T``V)U9U\S."YR97,`C51+CYM`#+[G5UBK'H#A-9Z!0",X5+VL
+begin 644 bug_38.res.gz
+M'XL("!3X`4X``V)U9U\S."YR97,`C51+CYM`#+[G5UBK'H#A-9Z!0",X5+VL
 MM.IATUN51.PNV2)E$Q1>I;^^GB$9TJ<:I-CC[_/8CK^P_OSQ_A,`\!P>[C_`
 M7=NT_J%ZNELMUA<$<Z#@KCI6K66O%LI"GL-3][H3B7\L![]IB];010[GZO@*
@@ -6 +6 @@
 MI]L*IV<8!9)<=/HMLMCIR`HFZ5LRU)2!)1-.'HH`-07IP$/%):<S=\<^*(AN
 MBA1->[I`/X4]'JBZR+2EZI,=M%4%!'$'C:?S&,L<#E73PD.V+Y[;T[GZ7EJU
-M/>,)_=RKQ1>^>;^@TXZ<C$\>;K(.F6Z:)G5Z9-W`(CKV`[,H7-A.1PZ9GEEI
-M(,D95(]3MOA7MF?2O4N^=WL!E=;=<)<>TVE*G5)[!#K:BHU7KQ;A%>=A;O;$
-MN0]!X/W_QR2B/U\B_$E`ZXSD0^JQ1MLEW1B<%#)+*"DDXTE2H(?(9QGQZ"*C
-M?293'H5)&L32XZ'D:1HDSDAT9Y1,+ITQ9F,RY\4Y30#%X0#GLCC`M+P&OA9]
-M">6W^G0LCVT#Z)J$I1H9UB"\T`N)]P+-Z:TTB>U0/9>&G"BR7OHUDNITHX!+
-M&$,3)CF,M*?"-A@WF-#8#80&D@0A84@S!C@SA&%$OR9+`\6_U8QTXS@WCO&%
-MK<7BXJUD<#EO$VGD^1^PM_^J^4O!G^?ZXRBS3%$]IE*J5G<]"?H%U5M+O9JZ
-/QN+VZMWB!Z3[6K;K!```
+M/>,)_=RKQ1>^>;^@TXZ<C$\>;K(.F6Z:)G5Z9-W`(CKV`[,\BA>VTRF/;$\V
+M#21Y@VISND#\ZP*3?TF_S:;2NAONTF,Z3:E3:H]`1UNQ\>K5(KSB/,S-GCCW
+M(0B\__^81/3G2X0_"6B=D7Q(/=9HNZ0;@Y-"9@DEA60\20KT$/DL(QY=9+3/
+M9,JC,$F#6'H\E#Q-@\09B>Z,DLFE,\9L3.:\.*<)H#@<X%P6!YB6U\#7HB^A
+M_%:?CN6Q;0!=D[!4(\,:A!=Z(?%>H#F]E2:Q':KGTI`31=9+OT92G6X4<`EC
+M:,(DAY&V7-@&XP83&KN!T$"2("0,:<8`9X8PC.C79&F@^+>:D6X<Y\8QOK"U
+M6%R\E0PNYVTBC3S_`_;V7S5_*?CS7'\<998IJL=42M7JKB=!OZ!Z:ZE74]=8
+.W%Z]6_P`?#(`S^L$````
 `
 end

Tst/Short/bug_38.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1303919339:3130- 14004 :3-1-3:ix86-Linux:mamawutz:186008
-1 >> tst_memory_1 :: 1303919339:3130- 14004 :3-1-3:ix86-Linux:mamawutz:669416
-1 >> tst_memory_2 :: 1303919339:3130- 14004 :3-1-3:ix86-Linux:mamawutz:702200
-1 >> tst_timer_1 :: 1303919339:3130- 14004 :3-1-3:ix86-Linux:mamawutz:12
+1 >> tst_memory_0 :: 1308751888:3132- 13777 :3-1-3:ix86-Linux:mamawutz:191260
+1 >> tst_memory_1 :: 1308751888:3132- 13777 :3-1-3:ix86-Linux:mamawutz:669416
+1 >> tst_memory_2 :: 1308751888:3132- 13777 :3-1-3:ix86-Linux:mamawutz:702200
+1 >> tst_timer_1 :: 1308751888:3132- 13777 :3-1-3:ix86-Linux:mamawutz:13

factory/cf_factor.cc

@@ -31 +31 @@
 #include "algext.h"
 #include "facAlgExt.h"
+#include "facFactorize.h"
+#include "singext.h"
 
 #include "int_int.h"
@@ -666 +668 @@
 CFFList factorize ( const CanonicalForm & f, const Variable & alpha )
 {
+  if ( f.inCoeffDomain() )
+    return CFFList( f );
   //out_cf("factorize:",f,"==================================\n");
   //out_cf("mipo:",getMipo(alpha),"\n");
@@ -795 +799 @@
 
   }
-  else if (f.isUnivariate() && ch == 0) // Q(a)[x]
+  else if (f.isUnivariate() && (ch == 0)) // Q(a)[x]
   {
     F= AlgExtFactorize (f, alpha);
@@ -801 +805 @@
   else //Q(a)[x1,...,xn]
   {
-      factoryError("not implemented");
+    F= ratFactorize (f, alpha);
   }
   if(isOn(SW_USE_NTL_SORT)) F.sort(cmpCF);

kernel/clapsing.cc

@@ -863 +863 @@
       {
         //  over Q(a)
-        if (F.isUnivariate())
-        {
-          L= factorize (F, a);
-        }
-        else
-        {
-          CanonicalForm G( convSingTrPFactoryP( f ) );
-          do
-          {
-            libfac_interruptflag=0;
-            L=Factorize2(G, mipo);
-          }
-          while ((libfac_interruptflag!=0) ||(L.isEmpty()));
-          #ifdef FACTORIZE2_DEBUG
-          printf("while okay\n");
-          #endif
-          libfac_interruptflag=0;
-        }
+        L= factorize (F, a);
       }
     }