Date: Wed, 1 Apr 2020 20:42:41 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530241 - in head/math/symmetrica: . files Message-ID: <202004012042.031Kgfcw077493@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Wed Apr 1 20:42:40 2020 New Revision: 530241 URL: https://svnweb.freebsd.org/changeset/ports/530241 Log: - Build and install the library with its headers; - Since I'm there, borrow several patches from the SageMath project. Approved by: yuri (maintainer) Added: head/math/symmetrica/files/patch-bar.c (contents, props changed) head/math/symmetrica/files/patch-bruch.c (contents, props changed) head/math/symmetrica/files/patch-de.c (contents, props changed) head/math/symmetrica/files/patch-def.h (contents, props changed) head/math/symmetrica/files/patch-di.c (contents, props changed) head/math/symmetrica/files/patch-ga.c (contents, props changed) head/math/symmetrica/files/patch-galois.c (contents, props changed) head/math/symmetrica/files/patch-macro.h (contents, props changed) head/math/symmetrica/files/patch-nc.c (contents, props changed) head/math/symmetrica/files/patch-nu.c (contents, props changed) head/math/symmetrica/files/patch-perm.c (contents, props changed) head/math/symmetrica/files/patch-rest.c (contents, props changed) head/math/symmetrica/files/patch-ta.c (contents, props changed) head/math/symmetrica/files/patch-zyk.c (contents, props changed) Modified: head/math/symmetrica/Makefile head/math/symmetrica/files/patch-makefile head/math/symmetrica/files/patch-part.c Modified: head/math/symmetrica/Makefile ============================================================================== --- head/math/symmetrica/Makefile Wed Apr 1 20:29:42 2020 (r530240) +++ head/math/symmetrica/Makefile Wed Apr 1 20:42:40 2020 (r530241) @@ -2,6 +2,7 @@ PORTNAME= symmetrica DISTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/ DISTFILES= SYM2_0_tar.gz @@ -11,13 +12,22 @@ COMMENT= Collection of routines for combinatorial math LICENSE= PD -USES= gmake MAKEFILE= makefile NO_WRKSUBDIR= yes -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} \ + include/${PORTNAME}/def.h \ + include/${PORTNAME}/macro.h \ + lib/libsymmetrica.a \ + lib/libsymmetrica.so \ + lib/libsymmetrica.so.0 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/test ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/libsymmetrica.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/libsymmetrica.so ${STAGEDIR}${PREFIX}/lib/libsymmetrica.so.0 + ${LN} -sf libsymmetrica.so.0 ${STAGEDIR}${PREFIX}/lib/libsymmetrica.so .include <bsd.port.mk> Added: head/math/symmetrica/files/patch-bar.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-bar.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,35 @@ +--- bar.c.orig 2007-12-06 16:29:59 UTC ++++ bar.c +@@ -1,4 +1,5 @@ + /* file bar.c symmetrica */ ++/* Patch from SageMath */ + #include "def.h" + #include "macro.h" + +@@ -237,7 +238,7 @@ INT rz_lehmercode_bar(a,b) OP a,b; + g = callocobject(); + e = S_V_I(a,0L); + f = S_V_I(a,1L); +- erg += sum(f,g); ++ erg += sym_sum(f,g); + j=0L; + for (i=0L;i<S_V_LI(e);i++) + j += S_V_II(e,i)*(i+1L); +@@ -427,7 +428,7 @@ INT makevectorof_class_bar(a,b) OP a,b; + for (i=0L;i<S_V_LI(b);i++) + erg += kranztypus_to_matrix(S_V_I(c,i),S_V_I(b,i)); + erg += freeall(c); +- erg += sort(b); /* AK 130592 */ ++ erg += sym_sort(b); /* AK 130592 */ + ENDR("makevectorof_class_bar"); + } + +@@ -615,7 +616,7 @@ INT length_bar(a,b) OP a,b; + c = callocobject(); + d = callocobject(); + erg += lehmercode_bar(a,c); +- erg += sum(S_V_I(c,1L),b); ++ erg += sym_sum(S_V_I(c,1L),b); + for(i=0L;i<S_P_LI(a);i++) + { + if (S_V_II(S_V_I(c,0L),i) == 1L) Added: head/math/symmetrica/files/patch-bruch.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-bruch.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,44 @@ +--- bruch.c.orig 2007-12-06 16:30:00 UTC ++++ bruch.c +@@ -1,4 +1,5 @@ + /* SYMMETRICA source code file: bruch.c */ ++/* Patch from SageMath */ + #include "def.h" + #include "macro.h" + +@@ -975,14 +976,16 @@ INT kuerzen_integer_integer(bruch) OP bruch; + ggterg = ggt_i(S_B_UI(bruch),S_B_OI(bruch)); + + if (ggterg == S_B_UI(bruch)) { ++ INT tmp = S_B_OI(bruch); + freeself_bruch(bruch); +- M_I_I(S_B_OI(bruch) / ggterg,bruch); ++ M_I_I(tmp / ggterg,bruch); + goto ende; + } + + if (-ggterg == S_B_UI(bruch)) { ++ INT tmp = S_B_OI(bruch); + freeself_bruch(bruch); +- M_I_I(- S_B_OI(bruch) / ggterg,bruch); ++ M_I_I(- tmp / ggterg,bruch); + goto ende; + } + +@@ -1032,12 +1035,14 @@ INT kuerzen_integer_longint(bruch) OP bruch; + + if (S_O_K(S_B_U(bruch)) == INTEGER) + if (S_B_UI(bruch) == 1) { ++ INT tmp = S_B_OI(bruch); + freeself_bruch(bruch); +- M_I_I(S_B_OI(bruch),bruch); ++ M_I_I(tmp,bruch); + goto ende; } + else if (S_B_UI(bruch) == -1) { ++ INT tmp = S_B_OI(bruch); + freeself_bruch(bruch); +- M_I_I( - S_B_OI(bruch),bruch); ++ M_I_I( - tmp,bruch); + goto ende; } + if (NEGP(S_B_O(bruch)) && NEGP(S_B_U(bruch))) + { Added: head/math/symmetrica/files/patch-de.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-de.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,17 @@ +--- de.c.orig 2007-12-06 16:30:00 UTC ++++ de.c +@@ -1,4 +1,5 @@ + /* de.c SYMMETRICA */ ++/* Patch from SageMath */ + #include "def.h" + #include "macro.h" + +@@ -24,7 +25,7 @@ OP cons_eins; /* global INTEGER variable 1 */ + OP cons_negeins;/* global INTEGER variable -1 */ + OP cons_null; /* global INTEGER variable 0 */ + FILE *texout; /* global variable for texoutput */ +-INT no_banner = FALSE; /* AK 281293 */ ++INT no_banner = TRUE; /* AK 281293 */ + INT no_mem_check=TRUE; /* AK 100893 */ + INT english_tableau=FALSE; /* AK 290995 */ + Added: head/math/symmetrica/files/patch-def.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-def.h Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,27 @@ +--- def.h.orig 2007-12-06 16:30:56 UTC ++++ def.h +@@ -1,5 +1,6 @@ + /* file def.h SYMMETRICA */ + /* INT should always be 4 byte */ ++/* Patch from SageMath */ + #ifndef DEF_H + + +@@ -3105,7 +3106,7 @@ extern INT Sn_wt(); + extern INT so_character (); + extern INT so_dimension (); + extern OBJECTKIND s_o_k(); +-extern INT sort(); ++extern INT sym_sort(); + extern INT sort_rows_tableaux_apply(); + extern INT sort_vector(); + extern OBJECTSELF s_o_s(); +@@ -3271,7 +3272,7 @@ extern INT sub_default(); + extern INT sub_part_part(); + extern INT substitute_one_matrix (); + extern INT substitute_one_monopoly (); +-extern INT sum(); ++extern INT sym_sum(); + extern INT sum_integervector(); + extern INT sum_matrix(); + extern INT sum_vector(); Added: head/math/symmetrica/files/patch-di.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-di.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,29 @@ +--- di.c.orig 2007-12-06 16:30:00 UTC ++++ di.c +@@ -61,6 +61,8 @@ + /* Written by: Ralf Hager Oktober 1992 */ + /*---------------------------------------------------------------------*/ + /* */ ++/* Patch from SageMath */ ++/* */ + /***********************************************************************/ + /***********************************************************************/ + +@@ -1355,7 +1357,7 @@ INT get_orb_rep(G,m,n,L,len,konstr) + m_il_nv(0L,weight_watcher); + m_il_nv(0L,perm_vec); + copy(S_V_I(FP,0L),fix); +- sort(fix); ++ sym_sort(fix); + + get_perm(hweight,p,b,S_I_I(n),S_I_I(m),0L, + perm_vec,weight_watcher,fix); +@@ -1502,7 +1504,7 @@ INT get_perm(w,p,b,n,m,ind,perm_vec,ww,fix) + if(ind == m) + { + mult_perm_fix(p,fix,hfix); +- sort(hfix); ++ sym_sort(hfix); + if(!hfix_in_ww(hfix,ww)) + { + inc(ww); Added: head/math/symmetrica/files/patch-ga.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-ga.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,27 @@ +--- ga.c.orig 2007-12-06 16:30:01 UTC ++++ ga.c +@@ -1,5 +1,6 @@ + /* SYMMETRICA: ga.c */ + /* group algebra */ ++/* Patch from SageMath */ + #include "def.h" + #include "macro.h" + +@@ -632,7 +633,7 @@ static INT co_posorneg_sum(a,b,what) OP a,b; INT what; + else if (what == 0L) + erg += vertikal_sum(S_V_L(a),c); + erg += copy(a,d); +- erg += sort(d); ++ erg += sym_sort(d); + erg += m_il_p(S_V_II(d,S_V_LI(d)-1L),e); /* identitaet */ + for (i=0L,k=0L,j=S_V_LI(d);i<S_P_LI(e);i++) + if (i+1L == S_V_II(d,k) ) +@@ -722,7 +723,7 @@ INT garnir(f,g,h,c) OP f,g,h,c; + + j=0L; + erg += append(h,g,h2); +- erg += sort(h2); ++ erg += sym_sort(h2); + for (i=0L;i<S_V_LI(g);i++) + { + erg += m_i_i(S_V_II(g,i),S_P_I(a,j)); Added: head/math/symmetrica/files/patch-galois.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-galois.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,17 @@ +--- galois.c.orig 2007-12-06 16:30:01 UTC ++++ galois.c +@@ -1,3 +1,5 @@ ++/* Patch from SageMath */ ++ + #include "def.h" + #include "macro.h" + +@@ -758,7 +760,7 @@ nn: + } + } + FREEALL2(v,nv); +- sort(res); ++ sym_sort(res); + } + S3R(k,phg_c,phg_d,"all_points_phg_store",res); + ENDR("all_points"); Added: head/math/symmetrica/files/patch-macro.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-macro.h Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,11 @@ +--- macro.h.orig 2007-12-06 16:30:56 UTC ++++ macro.h +@@ -1,5 +1,8 @@ + /* file: macro.h symmetrica source code */ ++/* Patch from SageMath */ + #ifndef MACRO_H ++ ++#include "string.h" + + #ifdef SYMMAGMA + #define SYM_MALLOC(a) mem_malloc(a) Modified: head/math/symmetrica/files/patch-makefile ============================================================================== --- head/math/symmetrica/files/patch-makefile Wed Apr 1 20:29:42 2020 (r530240) +++ head/math/symmetrica/files/patch-makefile Wed Apr 1 20:42:40 2020 (r530241) @@ -1,11 +1,35 @@ --- makefile.orig 2007-12-07 07:03:22 UTC +++ makefile -@@ -1,4 +1,6 @@ -+all: test +@@ -1,4 +1,29 @@ ++# Patch from SageMath to build the library + ++SOURCES:=bar.c bi.c boe.c bruch.c classical.c de.c di.c ff.c galois.c \ ++ ga.c gra.c hash.c hiccup.c io.c ko.c list.c lo.c ma.c mee.c \ ++ mem.c mes.c mhe.c mhh.c mhm.c mhp.c mhs.c mmm.c mms.c \ ++ mod_dg_sbd.c mo.c mpp.c mps.c mse.c msh.c msm.c mss.c muir.c \ ++ na.c nb.c nc.c nu.c part.c pee.c peh.c pem.c perm.c pes.c \ ++ phe.c phh.c phm.c phs.c plet.c pme.c pmh.c poly.c ppe.c pph.c \ ++ ppm.c ppp.c pps.c pr.c pse.c psh.c psm.c pss.c rest.c rh.c \ ++ sab.c sb.c sc.c sr.c ta.c teh.c tem.c tep.c tes.c the.c thm.c \ ++ thp.c ths.c tme.c tmh.c tmp.c tms.c tpe.c tph.c tpm.c tps.c \ ++ tse.c tsh.c tsm.c tsp.c vc.c zo.c zykelind.c zyk.c .c.o: - cc -c -O2 -DFAST -DALLTRUE $< -+ $(CC) -c $(CFLAGS) -DFAST -DALLTRUE $< - test: test.c bar.o bi.o boe.o bruch.o classical.o de.o di.o ff.o galois.o ga.o gra.o hash.o hiccup.o io.o ko.o list.o lo.o ma.o mee.o mem.o mes.o mhe.o mhh.o mhm.o mhp.o mhs.o mmm.o mms.o mod_dg_sbd.o mo.o mpp.o mps.o mse.o msh.o msm.o mss.o muir.o na.o nb.o nc.o nu.o part.o pee.o peh.o pem.o perm.o pes.o phe.o phh.o phm.o phs.o plet.o pme.o pmh.o poly.o ppe.o pph.o ppm.o ppp.o pps.o pr.o pse.o psh.o psm.o pss.o rest.o rh.o sab.o sb.o sc.o sr.o ta.o teh.o tem.o tep.o tes.o the.o thm.o thp.o ths.o tme.o tmh.o tmp.o tms.o tpe.o tph.o tpm.o tps.o tse.o tsh.o tsm.o tsp.o vc.o zo.o zykelind.o zyk.o +-test: test.c bar.o bi.o boe.o bruch.o classical.o de.o di.o ff.o galois.o ga.o gra.o hash.o hiccup.o io.o ko.o list.o lo.o ma.o mee.o mem.o mes.o mhe.o mhh.o mhm.o mhp.o mhs.o mmm.o mms.o mod_dg_sbd.o mo.o mpp.o mps.o mse.o msh.o msm.o mss.o muir.o na.o nb.o nc.o nu.o part.o pee.o peh.o pem.o perm.o pes.o phe.o phh.o phm.o phs.o plet.o pme.o pmh.o poly.o ppe.o pph.o ppm.o ppp.o pps.o pr.o pse.o psh.o psm.o pss.o rest.o rh.o sab.o sb.o sc.o sr.o ta.o teh.o tem.o tep.o tes.o the.o thm.o thp.o ths.o tme.o tmh.o tmp.o tms.o tpe.o tph.o tpm.o tps.o tse.o tsh.o tsm.o tsp.o vc.o zo.o zykelind.o zyk.o - gcc -DALLTRUE -DFAST test.c bar.o bi.o boe.o bruch.o classical.o de.o di.o ff.o galois.o ga.o gra.o hash.o hiccup.o io.o ko.o list.o lo.o ma.o mee.o mem.o mes.o mhe.o mhh.o mhm.o mhp.o mhs.o mmm.o mms.o mod_dg_sbd.o mo.o mpp.o mps.o mse.o msh.o msm.o mss.o muir.o na.o nb.o nc.o nu.o part.o pee.o peh.o pem.o perm.o pes.o phe.o phh.o phm.o phs.o plet.o pme.o pmh.o poly.o ppe.o pph.o ppm.o ppp.o pps.o pr.o pse.o psh.o psm.o pss.o rest.o rh.o sab.o sb.o sc.o sr.o ta.o teh.o tem.o tep.o tes.o the.o thm.o thp.o ths.o tme.o tmh.o tmp.o tms.o tpe.o tph.o tpm.o tps.o tse.o tsh.o tsm.o tsp.o vc.o zo.o zykelind.o zyk.o -o test -lm -+ $(CC) -DALLTRUE -DFAST test.c bar.o bi.o boe.o bruch.o classical.o de.o di.o ff.o galois.o ga.o gra.o hash.o hiccup.o io.o ko.o list.o lo.o ma.o mee.o mem.o mes.o mhe.o mhh.o mhm.o mhp.o mhs.o mmm.o mms.o mod_dg_sbd.o mo.o mpp.o mps.o mse.o msh.o msm.o mss.o muir.o na.o nb.o nc.o nu.o part.o pee.o peh.o pem.o perm.o pes.o phe.o phh.o phm.o phs.o plet.o pme.o pmh.o poly.o ppe.o pph.o ppm.o ppp.o pps.o pr.o pse.o psh.o psm.o pss.o rest.o rh.o sab.o sb.o sc.o sr.o ta.o teh.o tem.o tep.o tes.o the.o thm.o thp.o ths.o tme.o tmh.o tmp.o tms.o tpe.o tph.o tpm.o tps.o tse.o tsh.o tsm.o tsp.o vc.o zo.o zykelind.o zyk.o -o test -lm ++ $(CC) -c $(CFLAGS) -fPIC -DFAST -DALLTRUE $< ++ ++OBJS:=$(SOURCES:%.c=%.o) ++ ++all: test ++ ++libsymmetrica.a: $(OBJS) makefile ++ $(AR) crs $@ $(OBJS) ++ $(RANLIB) $@ ++ ++libsymmetrica.so: libsymmetrica.a ++ $(CC) -shared -o $@ -Wl,-soname,$@ $(OBJS) ++ ++test: test.o libsymmetrica.so makefile ++ $(CC) test.o -o $@ -L. $(LDFLAGS) -lsymmetrica -lm ++ Added: head/math/symmetrica/files/patch-nc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-nc.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,53 @@ +--- nc.c.orig 2007-12-06 16:30:15 UTC ++++ nc.c +@@ -1,4 +1,5 @@ + /* nc.c SYMMETRICA source code */ ++/* Patch from SageMath */ + #include "def.h" + #include "macro.h" + +@@ -204,7 +205,7 @@ INT scalarproduct_nc(a,b,c) OP a,b,c; + erg += mult(S_NC_C(a),S_NC_C(b),d); + erg += m_gl_co(S_NC_GL(a),e); + erg += mult_apply(e,d); +- erg += sum(d,e); ++ erg += sym_sum(d,e); + erg += m_gl_go(S_NC_GL(a),d); + erg += div(e,d,c); + erg += freeall(e); +@@ -617,7 +618,7 @@ INT reduce_nc_kranz(a,b) OP a,b; + erg += mult_nc_kranz(c,a,e); + erg += mult(S_V_I(e,1L),f,c); + erg += div(c,g,c); +- erg += sum(c,S_V_I(S_NC_C(b),S_I_I(d))); ++ erg += sym_sum(c,S_V_I(S_NC_C(b),S_I_I(d))); + } + erg += freeall(c); + erg += freeall(d); +@@ -712,7 +713,7 @@ INT m_vcl_kranz(l,a) OP l,a; + for(j = 0L; j<S_V_LI(c);j++) { + kranztypus_to_matrix(S_V_I(c,j),S_V_I(a,j)); + } +- sort(a); ++ sym_sort(a); + freeall(f); freeall(h); freeall(c); + return OK; + } +@@ -739,7 +740,7 @@ INT m_vco_kranz(l,a) OP l,a; + kranztypus_to_matrix(S_V_I(c,j),S_V_I(h,j)); + } + +- sort(h); ++ sym_sort(h); + m_l_v(S_V_L(h),a); + for(j = 0L; j<S_V_LI(c);j++) { + typusorder(S_V_I(h,j), zb, za, S_V_I(a,j), f); +@@ -789,7 +790,7 @@ INT order_class_kranz(l,i,a) OP l,i,a; + erg += kranztypus_to_matrix(S_V_I(c,j),S_V_I(h,j)); + } + +- erg += sort(h); ++ erg += sym_sort(h); + erg += typusorder(S_V_I(h,S_I_I(i)), zb, za, a, f); + erg += freeall(f); + erg += freeall(c); Added: head/math/symmetrica/files/patch-nu.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-nu.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,63 @@ +--- nu.c.orig 2007-12-06 16:30:16 UTC ++++ nu.c +@@ -1,4 +1,5 @@ + /* FILE:nu.c */ ++/* Patch from SageMath */ + #include "def.h" + #include "macro.h" + +@@ -531,13 +532,13 @@ add_ende: + ENDR("add"); + } + +-INT sort(a) OP a; ++INT sym_sort(a) OP a; + /* sortiert das object in aufsteigender reihenfolge AK 270787 */ + /* AK 160986 */ /* AK 280689 V1.0 */ /* AK 050390 V1.1 */ + /* AK 070891 V1.3 */ + { + INT erg = OK; +- EOP("sort(1)",a); ++ EOP("sym_sort(1)",a); + + switch(S_O_K(a)) + { +@@ -547,9 +548,9 @@ INT sort(a) OP a; + erg += sort_vector(a);break; + #endif /* VECTORTRUE */ + default: +- erg += WTO("sort",a); break; ++ erg += WTO("sym_sort",a); break; + }; +- ENDR("sort"); ++ ENDR("sym_sort"); + } + + INT length(a,d) OP a,d; +@@ -641,7 +642,7 @@ INT content(a,b) OP a,b; + ENDR("content"); + } + +-INT sum(a,res) OP a,res; ++INT sym_sum(a,res) OP a,res; + /* AK 280689 V1.0 */ /* AK 050390 V1.1 */ /* AK 120391 V1.2 */ + /* AK 140891 V1.3 */ + /* AK 170298 V2.0 */ +@@ -649,7 +650,7 @@ INT sum(a,res) OP a,res; + INT erg = OK; + COP("sum(1)",a); + COP("sum(2)",res); +- CE2(a,res,sum); ++ CE2(a,res,sym_sum); + + switch(S_O_K(a)) + { +@@ -680,7 +681,7 @@ INT sum(a,res) OP a,res; + erg += WTO("sum",a); break; + }; + +- ENDR("sum"); ++ ENDR("sym_sum"); + } + + Modified: head/math/symmetrica/files/patch-part.c ============================================================================== --- head/math/symmetrica/files/patch-part.c Wed Apr 1 20:29:42 2020 (r530240) +++ head/math/symmetrica/files/patch-part.c Wed Apr 1 20:42:40 2020 (r530241) @@ -1,13 +1,38 @@ ---- part.c.orig 2017-12-31 07:40:55 UTC +--- part.c.orig 2007-12-06 16:30:17 UTC +++ part.c -@@ -1767,8 +1767,8 @@ static int rec01(INT ni, OP vec) +@@ -1,5 +1,6 @@ + /* SYMMETRICA V2.0 260298 */ + /* file: part.c */ ++/* Patch from SageMath */ + + #include "def.h" + #include "macro.h" +@@ -347,7 +348,7 @@ INT append_apply_part(a,b) OP a,b; + if (a == b) { /* a := a+a */ + if (S_PA_K(a) == VECTOR) { + erg += append_apply_vector(S_PA_S(a),S_PA_S(b)); +- erg += sort(S_PA_S(a)); ++ erg += sym_sort(S_PA_S(a)); + goto endr_ende; + } + else if (S_PA_K(a) == EXPONENT) { +@@ -406,7 +407,7 @@ INT append_apply_part(a,b) OP a,b; + k=S_PA_LI(b)-1; + /* + erg += append_apply_vector(S_PA_S(a),S_PA_S(b)); +- erg += sort(S_PA_S(a)); ++ erg += sym_sort(S_PA_S(a)); + */ + inc_vector_co(S_PA_S(a),S_PA_LI(b)); + for (j=S_PA_LI(a)-1;j>=0;j--) +@@ -1767,8 +1768,8 @@ static int rec01(INT ni, OP vec) /* to compute number of partitions */ { INT erg = OK; - if (ni<0) return; - if (not EMPTYP(S_V_I(vec,ni))) return; -+ if (ni<0) return 0; -+ if (not EMPTYP(S_V_I(vec,ni))) return 0; ++ if (ni<0) return NULL; ++ if (not EMPTYP(S_V_I(vec,ni))) return NULL; else if (ni<=1) M_I_I(1,S_V_I(vec,ni)); else { Added: head/math/symmetrica/files/patch-perm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-perm.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,47 @@ +--- perm.c.orig 2007-12-06 16:30:19 UTC ++++ perm.c +@@ -1,4 +1,5 @@ + /* SYMMETRICA perm.c */ ++/* Patch from SageMath */ + #include "def.h" + #include "macro.h" + +@@ -833,9 +834,9 @@ komponeten. */ + /* s = Anzahl der spalten */ + + s = S_V_LI(S_V_I(a,0L)); +- sum(S_V_I(a,0L),summe);/* composition ist vector */ ++ sym_sum(S_V_I(a,0L),summe);/* composition ist vector */ + z = S_I_I(summe); +- FREEALL(summe); ++ FREEALL(summe); + m_ilih_nm(s,z,b); + C_O_K(b,KRANZTYPUS); + for (i=0L;i<s;i++) +@@ -1114,7 +1115,7 @@ h wird der vektor der label der konjugiertenklassen */ + erg += kranztypus_to_matrix(S_V_I(c,i),S_V_I(h,i)); + } + +- erg += sort(h); ++ erg += sym_sort(h); + + erg += chartafel(b,ct); + +@@ -1926,7 +1927,7 @@ INT numberof_inversionen(a,b) OP a,b; + OP c; + c = CALLOCOBJECT(); + erg += lehmercode_permutation(a,c); /*result is a vector */ +- erg += sum(c,b); ++ erg += sym_sum(c,b); + FREEALL(c); + } + ENDR("numberof_inversionen"); +@@ -2364,7 +2365,7 @@ vgl verfahren 1 in diplomarbeit */ + COP("rz_lehmercode(2)",b); + + zw = callocobject(); +- erg += sum(lc,zw); ++ erg += sym_sum(lc,zw); + if (NULLP(zw)) + { + erg += m_il_integervector((INT)0,b); Added: head/math/symmetrica/files/patch-rest.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-rest.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,17 @@ +--- rest.c.orig 2007-12-06 16:30:31 UTC ++++ rest.c +@@ -1,4 +1,5 @@ + /* SYMMETRICA file:rest.c */ ++/* Patch from SageMath */ + #include "def.h" + #include "macro.h" + +@@ -3998,7 +3999,7 @@ aaa: + oj = j; + } + } +- erg += sum(c,b); ++ erg += sym_sum(c,b); + eee: + erg += freeall(c); + ENDR("charge_word"); Added: head/math/symmetrica/files/patch-ta.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-ta.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,26 @@ +--- ta.c.orig 2007-12-06 16:30:36 UTC ++++ ta.c +@@ -1,4 +1,5 @@ + /* SYMMETRICA file:ta.c */ ++/* Patch from SageMath */ + #include "def.h" + #include "macro.h" + +@@ -1596,7 +1597,7 @@ aaa: + { + OP d,e; + e = CALLOCOBJECT(); +- erg += sum(content,e); /* AK 271098 */ ++ erg += sym_sum(content,e); /* AK 271098 */ + d = CALLOCOBJECT(); + erg += weight(shape,d); + if (NEQ(d,e)) +@@ -1821,7 +1822,7 @@ INT matrix_twoword(matrix, column_index, row_index) + CE3(matrix, column_index, row_index,matrix_twoword); + c = callocobject(); + erg += zeilen_summe(matrix,c); +- erg += sum(c,c); ++ erg += sym_sum(c,c); + erg += m_l_v(c,column_index); + erg += m_l_v(c,row_index); + for(i=0,l=0;i<S_M_HI(matrix);i++) Added: head/math/symmetrica/files/patch-zyk.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/symmetrica/files/patch-zyk.c Wed Apr 1 20:42:40 2020 (r530241) @@ -0,0 +1,28 @@ +--- zyk.c.orig 2007-12-06 16:30:50 UTC ++++ zyk.c +@@ -1,6 +1,7 @@ + + /* Routinen zur Berechnung von Zykelindikatorpolynomen + * Nikolaus Schueler 90/91 ++ * Patch from SageMath + */ + #include "def.h" + #include "macro.h" +@@ -804,7 +805,7 @@ static INT zykelind_arb_co(expztvec,numztvec,pol) + zykeltypvec = CALLOCOBJECT(); + ak_order = CALLOCOBJECT(); + +- sum(numztvec,ak_order); /* AK 060295 */ ++ sym_sum(numztvec,ak_order); /* AK 060295 */ + + + +@@ -1176,7 +1177,7 @@ INT no_orbits_arb(a,b,c) OP a,b,c; + erg += m_i_i(0,c); + while (z!=NULL) + { +- erg += sum(S_PO_S(z),e); ++ erg += sym_sum(S_PO_S(z),e); + erg += hoch(b,e,e); + erg += mult_apply(S_PO_K(z),e); + erg += add_apply(e,c);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004012042.031Kgfcw077493>