Changeset 3f34dc in git


Ignore:
Timestamp:
Mar 28, 2019, 5:35:48 PM (5 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
85bf0bd9379a2f8dca0c749e9c8cc9aba4ea0dfd
Parents:
dc89d7ed07175b22994d023d56b3277e8b715e32
Message:
code cleanup: F5C (and tests for sba)
Files:
2 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • Singular/test.cc

    rdc89d7 r3f34dc  
    9696
    9797////////#include "F5cData.h"
    98 #include "kernel/GBEngine/f5c.h"
    9998#include "kernel/GBEngine/f5data.h"
    10099#include "kernel/GBEngine/f5gb.h"
  • Tst/Long/cyclic-sba_l.res.gz.uu

    rdc89d7 r3f34dc  
    1 begin 644 cyclic-sba_l.res.gz
    2 M'XL("&S*_D\``V-Y8VQI8RUS8F%?;"YR97,`M91+;]I`%(7W_(HKA%2;V(Z'
    3 M\1-42RV)%*0HD2!=M)O(P`!6!]NR!P52];_WVI#Q0*%I%_7&>,ZY9R[?/"9/
    4 M-Z,'`"`17%]#9S3OM":'H9X%\C>U*KF<QL^E)4H!I@D\2Y<@6"E*6&1%I4FW
    5 M4[LW)2NAF.UF/)D!V\;KG./`HLC6,)I,/@T_A`'D<<X*6><J,WH6W(\^0QMG
    6 MLW@R;0^DXD>`@\])F@A-'[2J-T01["<RJQZYE;(7JQ2QD$5!U$2'=70[S_CN
    7 M.)K8C8L0"_(BFQUR4RU)!;SJ4D8Z/^0'XL&G<J3P$5Z;0+<6B@11C5&A/=NF
    8 MAK;5;,O24I/HNF[,\\;N[W/F+.:0H'\_MY;JC26L+?53BCIXRM+9"LWMX=?A
    9 M_6AHMJ_V@EK6(W49V^99(;2Q(E!52!3AT#H3FR+5ZCD4$1O]*3\4MKWPF-KJ
    10 M!!NU%6R47,!&Z7O8C-41..J>@%MEZVRI27R&TCOU_X7@5=N\:S8(#2]@=,@%
    11 MC`[]`T;'53`Z7H/1P1Y/>GO;AKY2CN#+'%UB(9,/_\"7GC`Z8%D,9+R+^WR!
    12 MF7A6M,0@AHV%WV['CS"^O?DR?!H]/DSZ0#UI)\=V\HZ]I]KM\^G$#Z2?'OO/
    13 MQJM^)X+O"><QYX,6WC-XA--XS0#ZL&0I*V)>G>I*J79B+?7?"JI1L<M9O?I]
    14 M*)'PAL?R!G+=Z`+WE1;H]6S=+B[FG"WPVI&N;O=W92PSO8NK%)AWTN6?6Z?@
    15 D+\CX/I'^\+^1\92KT</-7MW`U06[*37LJM/Z!:Y_0`M(!@``
     1begin 640 cyclic-sba_l.res.gz
     2M'XL("$WVG%P"`V-Y8VQI8RUS8F%?;"YR97,`E93-;IM`%(7W?HHK9*E#`H1A
     3MP!A%16K=19"B+NQNNHHPAH"$`3%CU4G5=\\%TV%P2ZJR`>:<^S,?E]E]^Q)]
     4M!0`:PMT=+*/#<K$;EAP+Y#.S.IGOXR=N"2[`-*&LJV<0*1<<LKKM-.EV>_>)
     5MIQS:Y"4IBP32<WQL2ES(VOH(T6[W:?,A6$,3-VDKXSREXLJ"Q^@S:%C-*HN]
     6M=B\5/P1<?"JJ0A#]?M'=(0SA4LCL>BRM*OUA<1$+&;0.Q]1!GUIKZO)EFIK:
     7MHXM2"YJV3H:\%2DJ`:^ZE)'.3_F">/#J'!5\A-<QH=<+;8&HMJ@PQ[:90<[$
     8MMBQ2F537=>/0C';_DN>0QB44Z+_4)I4^6H+>TE]<](GW:97D:-8VWS>/T<;4
     9M;B^"&N;0/BP]-W4KR%81F"H4BC"TGHI36Y&^AB)BH[_DB\+6":;4\BMLS%:P
     10M,3J#C;%_83/R"3CF78'+ZV/]3"0^0^F=^?]#\%8S'\8!8<$,1I?.8'39.QA=
     11M3\'HKD:,+O9XU=OO,?25<`3/&W2)3&8>=N!+3Q`.6#(9Y^&89Y@2?Q52&-2P
     12MQY0>G4I4D1Q5LB=1;"JI46XXLY.<K-&&Y\3-#>(YI!G^R-)%WHG1_PS:`IE\
     13J%CEOGC>+:&T^2-?J+Y#\^3TI`^_A1'2G47?8G#A!UW+Q!GC1G]M4!0``
    1614`
    1715end
  • Tst/Long/cyclic-sba_l.stat

    rdc89d7 r3f34dc  
    1 1 >> tst_memory_0 :: dilbert:-1633883648
    2 1 >> tst_memory_1 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:2705518592
    3 1 >> tst_memory_2 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:2713066256
    4 1 >> tst_timer_1 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:36347
     11 >> tst_memory_0 :: 1553790541:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:955265288
     21 >> tst_memory_1 :: 1553790541:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:1144233984
     31 >> tst_memory_2 :: 1553790541:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:1228559560
     41 >> tst_timer_1 :: 1553790541:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:4086
  • Tst/Long/cyclic-sba_l.tst

    rdc89d7 r3f34dc  
    3838f = sba(i,0,0);
    3939f = sba(i,0,1);
    40 killall;
    4140string bench = cyclicnh(8);
    4241sprintf(bench);
    4342ideal f;
    4443f = sba(i,0,1);
    45 killall;
    4644
    4745tst_status(1);$
    48 LIB "poly.lib";
    49 killall();
    50 killall("proc");
    51 exit;
  • Tst/Long/eco-sba_l.res.gz.uu

    rdc89d7 r3f34dc  
    1 begin 644 eco-sba_l.res.gz
    2 M'XL(",_,_D\``V5C;RUS8F%?;"YR97,`M5;;;MM&$'WW5PP$`Z4N9#B[O%JU
    3 M@-8Q$`%%#$CI2X,TH&4JHD52!$DCLHK^>V=):7<E48E?^B+),V?.S!SR>'?^
    4 MZ?WT(P#@!-Z]@^OIT_75?!]B%LC?W!+IZC'Z6EEU58-I0KK)OT$=5W4%RTTI
    5 M<A+M-.B7*JZ@7+PNTF0!\3;*BI0"RW*3P70^_^WNES"`(BKB4M:Y6D?/@C^F
    6 MOT./NEEI\M@;RXP_`0I^3?*D-OKC*_$-DPG$BXTI!DRM//YN5754RXI@HGC#
    7 MAK=7;-+78UZT%0K1@J+<+`1I;B1Y#7D?_I%931FD70$$8@>WD)NH^#R1*1-2
    8 M:48ISFR;CXRM85O6KM\?/14*&0CDX2]F'QBST?-H+5&,-?&G.$HA4=&FO]@&
    9 M%"%K6A?458W#FB;TI(SLUAYGO][N3#;.AD-M+]YT;@N+P=;(^O2QZTL*SMK\
    10 MFO*VBCIM5%`_WV9#'#\+<OHZ)O=:V)X>AK`UUJ+!\VF7X`!<#X<RZNQG^U<&
    11 MF#8LF&!0Y_Y8R>CLQTH^4^*+`"DN3Y4J@9RFK^1WV\?PF1[I%R`@S6AB.ZJI
    12 MC^NR@]9*$M<YTQI/M'8]ZT2,3.,\'L6S+0VI)O;8?L3C]3Q'O9Z>5!V@JIN7
    13 M\3'.%RLJZ-W?/9B]81LU=D(]6=7TC[?%IJR-1,5]6XO/M+AF"+_9O8SKES(W
    14 MFEX:CJ:16_F^\IL?:'Y;G1G.#Q5_@)<,%_`?&&ZT.K)<X.J6"_QNRP5AE^5"
    15 M[+!<R,\M%[H_M5SH=UINL%(D88?IT,:WF`YM_C;3H>UVF`YM_]AT:(<=IANL
    16 M_N;*>(AXR7B(O,-XB*[^MB/Z/S0>=6.J-#PS'S+\F?F0<>M$%&4^9,?C,%\W
    17 MWTK!PB[S(4?YJB*7ZK_!?,.>^:&G:-Q.!R+W.QV(7#D$';SH0'2X<B`ZSD05
    18 M4<.3&9NS#U$K]B90%82IEY)7[($H$>3IUB[+L:*FXW=)?'0X&\G('@G&O^YG
    19 M#S"[?__GW:?IP\?Y#;B^*_'A!-9)FD9I.KZB>P2=TGF4Q0`W\"W.XS)*Q<$M
    20 M,N)?1I.Z.12(:/U:Q(WF-U#1/B]I=+AAH$MG?,>6JW9-JAT,2+BG>$F7"HD9
    21 M#,XS,\F(ES0Q/T@,ZU#%Y;HJ>$$5FTF\\_^IXJKW0)Q+XG8E[D\OE4%375_]
    22 )!Y"UXBTD"@``
     1begin 640 eco-sba_l.res.gz
     2M'XL(""[VG%P"`V5C;RUS8F%?;"YR97,`M9;;;IM`$(;O\Q0C*U+Q`<KL<HP;
     3M2SU)B52U4M*[J(V(@VMBP`BPZKCJNW<6[-UUC-/THC?&FL,_L\-^[%Y__7#Y
     4M&0!P`J]?P^GE_>G)]=;$+)#_N27<U5UT6UEU58-I0KK,?T`=5W4%LV4I?#+:
     5M::)755Q!.7V<ILD4XG64%2D99N4R@\OKZ[?O7X4!%%$1ES+/U2IZ%GRZ?`<]
     6MJF:ER5UO+#W^!,AXF^1);?3')^()DPG$TZ4I&DRM//YI5754RXQ@HG3#1K=7
     7M+-/'?5VT512B!46YG`K1W$CR&O(^_))>;3)(:P40$1LXA]Q$I><)3YG0E*[(
     8MQ9EM\Y&Q-FS+VO3[H_M"109*C]D[O6ST,%K(&,8:^WT<I9`H:U-=K`64'&L*
     9M%U13-<,"8:/W9&3G]CA[<[XQV3@;#K55\:9RFU@,UD;6IY]-7TIPUOH7Y+>5
     10MU6FM0OKA/!OB^$&(TV-?W&O#MO(PA+6Q$`4>GE8)=H&+X5!:G6UOOZ6!:<V"
     11M"0955B+.MJGDALS?1(AR>2I1C<=IJDIUMWT)-_0ZOP$%4H<FMHV:>K,NVTU:
     12M#<1U#B:-3R;M>M:3462:YGXKGFUID:ICCVU;W%^>YZBMY,F9`U1ULQ'OXGPZ
     13MIX3>Q_=?S-ZPM1H;?79>4S]>%\NR-A)E]VW-?J79-1C\9NUE7*_*W&AJ:7'4
     14MC5R5[RO6_$!C;7X`FQ\J_0"/P1;P9V`;S?=P"[3/3.!WXQ:$7;B%V(%;R`]Q
     15M"]V_XA;ZG;@-YDHD[``.;7P)<&CSEP&'MML!'-K^/G!HAQW`#>;?N4Q!/`8=
     16M(N^`#M'5=SJB_RQT5(NIU/``/&3X-_"0\>/@(=MOA_DZ>',5%G:!AQSEID+.
     17M_P&\8<^\Z"D9MY,^Y'XG?<@5'>C@4?K0X8H^=)R)2J*"3WILSCQ$+=F;0%50
     18M3#V3NF(=B#*">&YAF:DL.G5G)$=GLI&,[)$N&$Y@D:1IE*;C$[HIT#F<1UD,
     19M<`8_XCPNHU0<S<(C/@R-ZVR7(*SU8Q$WTSV#BCI?I='N#H$NG>(=ZYFW"Z+<
     20MP8!&=!_/Z-H@8XRC&?W#E"LP]#?1EY7QV)3,"QG##N?D<GU.J,_)=?[?G%RU
     218!\1Y)&Y4XLZTJ@QJX/3D#^=@,1L8"@``
    2322`
    2423end
  • Tst/Long/eco-sba_l.stat

    rdc89d7 r3f34dc  
    1 1 >> tst_memory_0 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:629220144
    2 1 >> tst_memory_1 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:646029312
    3 1 >> tst_memory_2 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:663382328
    4 1 >> tst_timer_1 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:60973
     11 >> tst_memory_0 :: 1553790510:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:179466488
     21 >> tst_memory_1 :: 1553790510:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:205901824
     31 >> tst_memory_2 :: 1553790510:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:210640896
     41 >> tst_timer_1 :: 1553790510:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2644
  • Tst/Long/katsura-sba_l.res.gz.uu

    rdc89d7 r3f34dc  
    1 begin 644 katsura-sba_l.res.gz
    2 M'XL("#;-_D\``VMA='-U<F$M<V)A7VPN<F5S`+6448^:0!2%W_T5-\:DZ`++
    3 M.*"B*8G=W61-F]T$W)>^;%`')1V!,&.JV_2_]X(ZH*TF/I079<ZY9ZZ?,S>8
    4 M/DY>`(!X<'\/K<FBU0@.2UT3U'=J%K*8A>_"E$*"80!/DR5()J2`*,T+3;GM
    5 MTKT13$`^W\UY/`>V#=<9QX4H3]<P"8+QPR=W`%F8L5S5.;4=>R9\FWR!)NYF
    6 M\GC6'"FE[P$NOL=)++7VJ%%\@N?!CU"*31X:19/<3-A/4\A0JJJ!5V6[978S
    7 M2_GN-)M8E8L0$[(\G1^#$RU.)'RTE8Y\?JD7!(1/X4C@,WQ4B4XIY#'"\E&A
    8 M7<NBNK;5+-/4DG:[K2^RRMS?IRQ8R"%&]V%K-%8>M_24CY!E[HPE\Q6ZFU_'
    9 MT^#-'QO-N[U2K^N2LHYMLS27FE\3:%V(:\*A=28W>:*5F]1$;/6W>JG![;IG
    10 MV%9GW*A5XT;)!6Z47N>FKT[(4>>,W"I=ITNMXJ?7>J?]FQ#>-8WGZHA0]P)'
    11 MFUS@:-,K'&VGQM'N51QM;/*L.740":D%('N1H4]&*OOX(PA1+M<[P(E&:@L'
    12 M3WN$N7ACM%@GNH6EWY_\5_"?'M\>II/7EV`(EG*34S>Y[N[BC8PY#SD?-7`8
    13 MX#5+PC4#&,*2)2P/>7'S"J4X+*4T/!84JW*7L?(/&H)`!AL>JC'A4.\2F=4>
    14 M#=9W.@A\P2*<#LK7Z?RM^"K5OL;1>%8^YU\D>S>1[-]$<O#_2+K5>>OAM2S&
    15 2:C$T-T+#GEJ-/UQGOA0=!@``
     1begin 640 katsura-sba_l.res.gz
     2M'XL(",_WG%P"`VMA='-U<F$M<V)A7VPN<F5S`+6448^:0!#'W_T4$V+2]0XX
     3MU@4534EL^W"F31_T^GQ!791T!<*NJ5[3[]X!=5EM,>E#>0'V_Y_9V1\S+%X^
     4MS;X"`(W@Z0FZLW6WLS@O]5W0S\RM9+F,7Z6KI`+'`9%G&U!<*@E)7E::=ONU
     5M>R^YA')U7(ET!?P0[PJ!"TF9[V"V6$P_O@M'4,0%+W5<8.PX<.'+[`-8N)LK
     6MTJ4UT<HP`EQ\3;-4D=ZD4]TABN![K.2^C)VJ2.%F_(<K5:QTU"AJ<H=U;JO(
     7MQ?$Z-_4:%Z4N%&6^NB3.2)HI>.MI'?G\U"\("*_*D<%[>&LR!K50I@AKC@KK
     8M>QZSR8%XKDNR7J]GKXO&/#QE6?-80(KN\]9H;#QA[:DOJ>J\2YZMMNBV/D]?
     9M%M_F4\=Z/"EF7)_6<?Q0Y*4B<T-@II`:PKETKO9E1NI-#!%+_:5?#+C]\`;;
     10M]H8;\PQNC+9P8^P^-WM[18X%-^2V^2[?D(:?;=3.AO^$\-%RGIL686$+1Y^V
     11M</39'8Y^8'#T!PU''XN\*4XW(J5&`F0O"_2I1.>^'()2[0JC,YQ$1P;8[`FF
     12MQ8$AJ4UMKTD:T&O)V"_HXZBE0L1"3#HXY3@_6;SC`&/8\(R7L:A&JE*J+JBE
     13M\26@6E7'@M?DQR#Q<'L1Z_D/6-1VY.WIS!C_\(`DUSS!L=<^<C>J]V?8',C5
     14M-]3-&?CW:#K/VA?\A>>@G>>PG>?H__$,FW8:X-15?\WJG[B7!`OH=GX#U1//
     15%NOP%````
    1616`
    1717end
  • Tst/Long/katsura-sba_l.stat

    rdc89d7 r3f34dc  
    1 1 >> tst_memory_0 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:925290632
    2 1 >> tst_memory_1 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:984936448
    3 1 >> tst_memory_2 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:1057959936
    4 1 >> tst_timer_1 :: 1342097664:0- spielwiese :spielwiese:version:dilbert:10288
     11 >> tst_memory_0 :: 1553790927:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:1856921448
     21 >> tst_memory_1 :: 1553790927:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:1932492800
     31 >> tst_memory_2 :: 1553790927:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:1951961088
     41 >> tst_timer_1 :: 1553790927:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:16829
  • Tst/Long/ok_l.lst

    rdc89d7 r3f34dc  
    1010classify_l
    1111classify2
     12cyclic-sba_l
    1213deform_l
    1314det_minor
     15eco-sba_l
    1416eliminate_2
    1517eliminate_6
  • Tst/Long/ok_l2.lst

    rdc89d7 r3f34dc  
     1katsura-sba_l
    12knapsack
    23symodstd
  • kernel/GBEngine/GBEngine.dox

    rdc89d7 r3f34dc  
    55 Main header(s) in `/kernel/GBEngine/`:
    66 - \ref kernel/GBEngine/F4.h
    7  - \ref kernel/GBEngine/f5c.h
    87 - \ref kernel/GBEngine/f5data.h
    98 - \ref kernel/GBEngine/f5gb.h
  • kernel/GBEngine/Makefile.am

    rdc89d7 r3f34dc  
    55
    66noinst_LTLIBRARIES=libGBEngine.la
    7 libGBEngine_la_SOURCES=khstd.cc kstdfac.cc kstd1.cc kstd2.cc kutil.cc nc.cc sca.cc gr_kstd2.cc kspoly.cc kpolys.cc syz.cc syz0.cc syz1.cc syz2.cc syz3.cc syz4.cc units.cc tgb.cc tgbgauss.cc f5data.cc f5lists.cc f5gb.cc f5c.cc ratgring.cc shiftgb.cc ringgb.cc janet.cc
     7libGBEngine_la_SOURCES=khstd.cc kstdfac.cc kstd1.cc kstd2.cc kutil.cc nc.cc sca.cc gr_kstd2.cc kspoly.cc kpolys.cc syz.cc syz0.cc syz1.cc syz2.cc syz3.cc syz4.cc units.cc tgb.cc tgbgauss.cc f5data.cc f5lists.cc f5gb.cc ratgring.cc shiftgb.cc ringgb.cc janet.cc
    88
    99libGBEngine_la_includedir=$(includedir)/singular/kernel/GBEngine
    10 libGBEngine_la_include_HEADERS=syz.h kstdfac.h kutil.h khstd.h kstd1.h units.h ratgring.h shiftgb.h nc.h kInline.h tgb.h ringgb.h tgbgauss.h tgb_internal.h f5c.h f5data.h f5gb.h f5lists.h janet.h
     10libGBEngine_la_include_HEADERS=syz.h kstdfac.h kutil.h khstd.h kstd1.h units.h ratgring.h shiftgb.h nc.h kInline.h tgb.h ringgb.h tgbgauss.h tgb_internal.h f5data.h f5gb.h f5lists.h janet.h
    1111
    1212
  • kernel/GBEngine/test.cc

    rdc89d7 r3f34dc  
    4949#include "kernel/GBEngine/shiftgb.h"
    5050#include "kernel/GBEngine/kutil.h"
    51 #include "kernel/GBEngine/f5c.h"
    5251#include "kernel/GBEngine/f5data.h"
    5352#include "kernel/GBEngine/f5gb.h"
  • kernel/mod2.h

    rdc89d7 r3f34dc  
    5252/* linear algebra extensions from pcv.h/pcv.cc */
    5353#define HAVE_PCV 1
    54 
    55 /* procedures to compute groebner bases with the f5 implementation */
    56 /* still testing */
    57 #undef HAVE_F5
    58 
    59 /* procedures to compute groebner bases with the f5c implementation */
    60 /* still testing */
    61 #undef HAVE_F5C
    6254
    6355/* procedures to compute with units */
  • kernel/test.cc

    rdc89d7 r3f34dc  
    9696
    9797////////#include "kernel/F5cData.h"
    98 #include "kernel/GBEngine/f5c.h"
    9998#include "kernel/GBEngine/f5data.h"
    10099#include "kernel/GBEngine/f5gb.h"
Note: See TracChangeset for help on using the changeset viewer.