Changeset 48031e in git

Timestamp:

Aug 6, 2019, 12:38:54 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

48f20b0402356f0f7fa136772209441b8b6d869c

Parents:

10ccdf4ec3a17fc1e6b47d06f9abf4565ae63341

Message:

opt: make_cf -> CFFactory in FLINTconvert.cc

Files:

• Tst/Short/absfact.res.gz.uu (modified) (1 diff)
• Tst/Short/absfact.stat (modified) (1 diff)
• factory/FLINTconvert.cc (modified) (1 diff)

Tst/Short/absfact.res.gz.uu

@@ -1 +1 @@
 begin 640 absfact.res.gz
-M'XL("#A40%T"`V%B<V9A8W0N<F5S`.V<6V_;.!;'W_,IB&*`D2PI(0]OX@3V
-MP^QB%P,L]J'IVZ`IY-2>&IM-@EC=2/WT>VC9)%W1M]:=+K9*45OFS1+/__QX
-M1)&^>?/7W_Y)"&$3\H_??B6OZF5]>;^8OKJ^N%GGP(1@XKO%PZ).TNL+^TXF
-M$U)-E_/JKKY\F+U<+NNJ=N7YA+AC<=FUNBF\W;(,2JI+\KQX^(.\)F.2T#0G
-M29.W^';_Y,OK"5E^>'RNQX3ZQ')"GA[O6_)D*Q9ZU-P"R0B,FE&[.E*C!E_;
-M6X&O3*P3A4Y'B6P@:R&]Y:.D*=KT5OA&S82\G\W)#;:)I_XW//7'Y\6G6?*4
-MDNN+BZLK\G.8_#.Y>YY5]>P]J587D9/%`WGYL+C[@`GWBV5M&WF\_UC/WLU7
-M=98DJ3_,;#N;#++.2,EB299X-'M_:?/?/)+J[FZV7!*LT+7U.._5RDG=/LU(
-MLIBOBCU4_Y[AN;]42U(MEXL_'F;O;5OUXRKW>59_?'X@_ZGN/\[27VS&^F\Y
-MJ^W9)S?I=>^$KR^(LQ6CD["L2V81\S"81-KZG;W]!1LD[_!@S*Z`,9#=9W@[
-M3@HT4Y4QDXZ:C'%KL<P:MLJ,2+M2_.U88F92I:.V2Q%OQVC#"ZR_:ICE+.>Y
-MN,"2_HNPN/\2;.\6"C6J"M2":S7!Q$RFKDU;!=^[-L%=%'<=0%[[2Q6=:-YL
-M:^;7O_R=H&XBLL&<'TTYTG?<&]]Q*B8<?5@XSII%D[7>AD5EE>.%D0!:F?%5
-MHM62M:G3B4"=L#TZJ?:)`Q6TTJJ54$0FI><;,Y?D7XO[^T`O@&YT"'D0\RF`
-M$'EKBOE<OH]=:+/1"`V))1#D^.4W)-E9.OWA40<BBCJ0,;.H@XJ5H:Y&GP%K
-MGP@[X6TDYA0&.@8B*/>#J*>!-YT&=I1/!W)AGYH8N3B-Z("S$\CE8/5U0N#@
-M4<-Y#S5<'$8-CVF:JWVHX1VC`VCD6EO*5'B6>=%469M7KG`YB<C+5KB^2&R%
-M--]T1E#)^.L2M'==@AV^+@&1ZQ)\^[I$@=<67IH0`T7/YCQ"1BDJ8N.^.#SN
-M%QZC%J&;X3D<\INM2)#E<.P('P_]A#N[,@9<80;@GELSDL:`*V/QD(23)!.$
-MBL6?H1D9W!!+L;[-?1[3'%E5I_E[CRHI-U0:-[<B2^I;7D"-02;4R$7\@"G2
-MIHBB2RV837>C@,2;:/=G"ZM"8(T,*V0*&\ML8Y:P/LLVE@F;9[/\F>A=^,M?
-M+5^EIQ"PJS!`4)91"$IS6+P^7&B@EEE3JZ+A-2^8&F&"*!@%,6IJ6=0JPP->
-M`Y81V2H94QN1@4TML#!D8&MUE;$JV!9LI1IOAK$TQT)%#7O"D67@!LO@MF=S
-M02IPW&=WF8KM0B0JA.S0U$Y,NCH#*FW?0@R5BO^_"4MXCBJYC@4#A:E)B-8M
-ML"KMP.J'#57N#/%.BO`&MA%EHFS3]*`$J1=$?[C=2("Z!EF,+1IVL^5$K`Q$
-MZ7J4QXBBQ;G-&3P`T*KGT5KO]FCMIOW'^HHQGVX&ISZ3",KX-']Y>'K#6N0D
-M(900\^N2#WY]9I.*F%^7\AM85'G7+G7/M<O2N79"\RJ?IGDW<Q.X>&DB@[:A
-M@W^?20R&1?W;P%=0_BXB!<-CSFW$X-QGMF?TX9I1YS:G]IYMRIYG&W/0LQFE
-MSK.3*F/IU=1GL<&_SZ,'O$F+^3>CA^\+.Z,DT_0483`J(G[.J!S\_,QV51$_
-M9U1_*[/ZI]B,FL_]G3%ZV-_MRI!M?Q\U/A.&J<8S*R18GQ)Z/A,G2,1-#'WY
-MC`T+EWL$BE%[I@*_8"9PF`AT/:MC9&#EGVUV_]"6`>T1`]AA8O@E+IX8=OV>
-M+\`':IQ9/?&U+@SD$2OX0NFL#&8?,H4#S<DB`A5C!^B!'=_(^F6,'6"^B_'M
-MNAIWS'H$L:M=#A&$\RA!6E]`#`0YLX9X=)T'X^K+131JOT9&.L807@X,^4;V
-MCRV28X)^)_/;U6'N&#;["UBW\F*;%FX]V'R<!+L"^.I(XI'(1'H+OOP&'HR,
-MMU@P3W_X_0%L:[D7\QP0ZH2%D6C^(EAE$WX4JX]^[;_$S]92@50`__%<[EO!
-M`P54&83K>"`+4D27PE+W'5M[`8R[J'`)KH]/Q6[(S$\#S'R`2]>C4;A(>HJF
-M5BK9N4\@U)AT'[VH)$H*CE\6YL4C>NJ2H0+[HI(!N:0C%\?`@[HEK@&]I*.7
-M+=)`*[)69=#P%K^T:46AD5_:+G#-F,!,A1VA&OPD,!%?6@\VN0';%M9(,N?[
-M(J)(X2$:DL'LQXWOX&."(:9,"$*/.A26W1%E-T0QL=DCE12ZVQNUM7YQ+_N<
-M-*U2-2I1=?N@/E^\R&2(-^ZOPN&MMX`UKA3'MVCY`7"V3Z.`4Z<`;B4,A`K3
-MG2[P2*9]X!VODX*I*E/0PUI/)RH@EMH0ZQG6L5;^*7_9BK?4Y_%6]@D#+<A>
-MA"_B[\]Z$=:>6[//RPX<4O&[,G4,B(03@UW/EX%%#XP^H<Q@%:2_P)$;5P3J
-M!H$5V;O"5'B7YD<BM0<Q)Q)F`$S7HU'`:'K4@!10H5"I%4-WT&X.4!3B>#U8
-MM*"$)$0$H0.6:,<2MGNN1X=S/;RH8)J!KJ:\`#T5Z17>3T[E^I11OGK*\;1]
-M93$\<3Z3P'2<-%H=\0!B;9BUL4*U3=>F6QEQWWS`75#M+C(?H$/0^%LUO1LT
-M3Z>!9GA"O>[1*&A*^K\A@S+`2^GPPG>%*F4T5!'92^F+B.XG,NS/8'Q<)E[Y
-MI1QBF+,HRBXGC/>PCB*G+(\8U+@T*`"A``0S4$HN)#=24E-247*C*0.A%?YG
-M#*-1J03F2$&I4D`1:O[7!P3'NA0H5L*P2@L4:C^MC:390$H+)4JI..#(I:AF
-M`O`K5L,CU4H8#8:656:KEH*6"D^.E>:$R`NDJD1A7WFAN?T>C."-890:.P*#
-MPC:5+!4#$XGKR\"5G_W]GUV&&;6'84/4=E[I&]C5U;%%^LR(H\(YK35L!74V
-M6++T%;PJ4'-KV/92VV@JZEB=$OR)@J,<,U$J.PEF5C>9)8O-/QB_18"9\#>"
-MUA-A^:?U5%A/6:])LJMPZEK<[`N:8Z%6(-F+%D8)*QH(^GG7/J'Y*0'B@'';
-ME28R)0;TI#E<.XO9BF(U#A^KMWX4`)1%=G(#A0%?9S4YT!BE@(KO87+/$J#(
-1DH"J++W^Z>*_BSX7&PM-````
+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
++Q7\!?:#A?_%,````
 `
 end

Tst/Short/absfact.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:192200
-1 >> tst_memory_1 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2490368
-1 >> tst_memory_2 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2490368
-1 >> tst_timer :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:18
-2 >> tst_memory_0 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:196928
-2 >> tst_memory_1 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2621440
-2 >> tst_memory_2 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2621440
-2 >> tst_timer :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:45
-3 >> tst_memory_0 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:196928
-3 >> tst_memory_1 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2621440
-3 >> tst_memory_2 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2621440
-3 >> tst_timer :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:1
-4 >> tst_memory_0 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:210376
-4 >> tst_memory_1 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2621440
-4 >> tst_memory_2 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2621440
-4 >> tst_timer :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:10
-5 >> tst_memory_0 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:209856
-5 >> tst_memory_1 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2715648
-5 >> tst_memory_2 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2715648
-5 >> tst_timer_1 :: 1564496952:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:80
+1 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:192208
+1 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2506752
+1 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2506752
+1 >> tst_timer :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:18
+2 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:197648
+2 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+2 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+2 >> tst_timer :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:50
+3 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:197648
+3 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+3 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+3 >> tst_timer :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2
+4 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:202280
+4 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+4 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+4 >> tst_timer :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:9
+5 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:201784
+5 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+5 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+5 >> tst_timer_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:83

factory/FLINTconvert.cc

@@ -215 +215 @@
     else if (mpz_cmp_si(nden,1)==0)
     {
-      result= make_cf(nnum);
+      result= CanonicalForm( CFFactory::basic(nnum));
       mpz_clear (nden);
     }
     else
-      result= make_cf (nnum, nden, false);
+      result= CanonicalForm( CFFactory::rational( nnum, nden, false));
   }
   else
   {
-    result= make_cf (nnum, nden, false);
+    result= CanonicalForm( CFFactory::rational( nnum, nden, false));
   }
   if (!isRat)