=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/switch.c,v retrieving revision 1.1.1.1 retrieving revision 1.5 diff -u -p -r1.1.1.1 -r1.5 --- OpenXM/src/kan96xx/Kan/switch.c 1999/10/08 02:12:01 1.1.1.1 +++ OpenXM/src/kan96xx/Kan/switch.c 2005/07/03 11:08:54 1.5 @@ -1,4 +1,6 @@ +/* $OpenXM: OpenXM/src/kan96xx/Kan/switch.c,v 1.4 2003/07/17 09:10:54 takayama Exp $ */ #include +#include #include "datatype.h" #include "extern2.h" #include "gradedset.h" @@ -19,7 +21,7 @@ void print_switch_status(void) { printf("mmLarger [matrix,lexicographic,tower] %s\n",F_mmLarger); printf("mpMult [poly,diff,difference] %s\n",F_mpMult); printf("monomialAdd [poly] %s\n",F_monomialAdd); - printf("red@ [standard,module1,module2,module1rev]\n"); + printf("red@ [standard,module1,module2,module1rev,ecart]\n"); printf(" %s\n",F_red); printf("isSameComponent [x,xd] %s\n",F_isSameComponent); printf("sp [standard] %s\n",F_sp); @@ -32,8 +34,8 @@ void print_switch_status(void) { or (report) (function) switch_function value(string) */ char *switch_function(fun,arg) -char *fun; -char *arg; + char *fun; + char *arg; { char *ans = NULL; if (strcmp(fun,"mmLarger")==0) { @@ -99,7 +101,7 @@ void switch_init(void) { */ void switch_mmLarger(arg) -char *arg; + char *arg; { if (strcmp(arg,"matrix") == 0) { mmLarger = mmLarger_matrix; @@ -118,7 +120,7 @@ char *arg; */ void switch_mpMult(arg) -char *arg; + char *arg; { if (strcmp(arg,"poly") == 0) { mpMult = mpMult_poly; @@ -138,7 +140,7 @@ char *arg; */ void switch_monomialAdd(arg) -char *arg; + char *arg; { if (strcmp(arg,"poly") == 0) { monomialAdd = monomialAdd_poly; @@ -147,7 +149,7 @@ char *arg; } void switch_red(arg) -char *arg; + char *arg; { if (strcmp(arg,"standard") == 0) { switch_sp("standard"); @@ -201,6 +203,19 @@ char *arg; lcm = lcm_module; switch_grade("standard"); F_red = "module2"; + }else if (strcmp(arg,"ecart") == 0) { + switch_sp("standard"); + isReducible = isReducible_module; + reduction1 = reduction1_gen; + reduction = reduction_ecart; + + isCdrReducible = isCdrReducible_gen; + reduction1Cdr = reduction1Cdr_gen; + reductionCdr = reductionCdr_gen; + + lcm = lcm_module; + switch_grade("module1"); + F_red = "ecart"; }else if (strcmp(arg,"debug") == 0) { reduction1 = reduction1_gen_debug; F_red = "debug"; @@ -208,7 +223,7 @@ char *arg; } void switch_groebner(arg) -char *arg; + char *arg; { if (strcmp(arg,"standard") == 0) { groebner = groebner_gen; @@ -221,7 +236,7 @@ char *arg; /* called from switch_init */ void switch_isSameComponent(arg) -char *arg; + char *arg; { if (strcmp(arg,"x") == 0) { isSameComponent = isSameComponent_x; @@ -233,7 +248,7 @@ char *arg; } void switch_sp(arg) -char *arg; + char *arg; { if (strcmp(arg,"standard") == 0) { sp = sp_gen; @@ -243,7 +258,7 @@ char *arg; void switch_grade(arg) -char *arg; + char *arg; { if (strcmp(arg,"standard")==0) { grade = grade_gen;