=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/include/ca.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- OpenXM_contrib2/asir2018/include/ca.h 2019/08/28 23:27:34 1.10 +++ OpenXM_contrib2/asir2018/include/ca.h 2019/09/19 06:29:48 1.11 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.9 2019/08/21 00:37:47 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.10 2019/08/28 23:27:34 noro Exp $ */ #include #include @@ -538,6 +538,7 @@ typedef struct oDMM { typedef struct oDMMstack { int rank,ordtype; DMM *in; + LIST obj; struct oDMMstack *next; } *DMMstack; @@ -678,11 +679,13 @@ struct order_spec { int id; Obj obj; int nv; - int ispot; /* 1 means Position over Term (Pos then Term) */ + int module_ordtype; /* 0=TOP, 1=POT, 2=wPOT, 3=Schreyer */ int pot_nelim; /* size of positions for pot-elimination order */ int *top_weight; int module_rank; int *module_top_weight; + struct order_spec *base; /* for schreyer order */ + DMMstack dmmstack; union { int simple; struct {