OpenXM_contrib2/asir2000/builtin/dp-supp.c - diff

Return to dp-supp.c CVS log

Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/dp-supp.c between version 1.29 and 1.31

version 1.29, 2004/02/09 08:23:29

version 1.31, 2004/03/09 09:40:46

Line 45

* DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,

* PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.

* $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.28 2004/02/05 08:28:53 noro Exp $

* $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.30 2004/03/05 02:26:52 noro Exp $

#include "ca.h"

#include "base.h"

Line 1311 void dp_nf_tab_f(DP p,LIST *tab,DP *rp)

* setting flags

* call create_order_spec with vl=0 to set old type order.

Line 1443 int create_composite_order_spec(VL vl,LIST order,struc

Line 1444 int create_composite_order_spec(VL vl,LIST order,struc

for ( i = 0; i < l; i++ ) top[i] = 0;

for ( t = wb, i = 0; t; t = NEXT(t), i++ ) {

if ( !BDY(t) || OID((Obj)BDY(t)) != O_LIST )

error("a list of lists must be specified for the key \"order\"");

a = BDY((LIST)BDY(t));

len = length(a);

a0 = (Obj)BDY(a);

if ( !a0 || OID(a0) == O_N ) {

/* a is a dense weight vector */

dw = (int *)MALLOC(sizeof(int)*len);

for ( j = 0, p = a; j < len; p = NEXT(p), j++ )

for ( j = 0, p = a; j < len; p = NEXT(p), j++ ) {

if ( !INT((Q)BDY(p)) )

error("a dense weight vector must be specified as a list of integers");

dw[j] = QTOS((Q)BDY(p));

}

w_or_b[i].type = IS_DENSE_WEIGHT;

w_or_b[i].length = len;

w_or_b[i].body.dense_weight = dw;

Line 1465 int create_composite_order_spec(VL vl,LIST order,struc

Line 1471 int create_composite_order_spec(VL vl,LIST order,struc

sw = (struct sparse_weight *)

MALLOC(sizeof(struct sparse_weight)*len);

for ( j = 0, p = a; j < len; j++ ) {

if ( !BDY(p) || OID((P)BDY(p)) != O_P )

error("a sparse weight vector must be specified as [var1,weight1,...]");

v = VR((P)BDY(p)); p = NEXT(p);

for ( tvl = vl, k = 0; tvl && tvl->v != v;

k++, tvl = NEXT(tvl) );

if ( !tvl )

error("invalid variable name");

error("invalid variable name in a sparse weight vector");

sw[j].pos = k;

if ( !INT((Q)BDY(p)) )

error("a sparse weight vector must be specified as [var1,weight1,...]");

sw[j].value = QTOS((Q)BDY(p)); p = NEXT(p);

}

w_or_b[i].type = IS_SPARSE_WEIGHT;

Line 1522 int create_composite_order_spec(VL vl,LIST order,struc

Line 1532 int create_composite_order_spec(VL vl,LIST order,struc

for ( start = 0, tvl = vl; tvl->v != VR((P)BDY(a));

tvl = NEXT(tvl), start++ );

for ( p = NEXT(a), tvl = NEXT(tvl); p;

p = NEXT(p), tvl = NEXT(tvl) )

p = NEXT(p), tvl = NEXT(tvl) ) {

if ( !BDY(p) || OID((P)BDY(p)) != O_P )

error("a block must be specified as [ordsymbol,var1,var2,...]");

if ( tvl->v != VR((P)BDY(p)) ) break;

}

if ( p )

error("a block must be contiguous");

error("a block must be contiguous in the variable list");

}

w_or_b[i].type = IS_BLOCK;

w_or_b[i].length = len;

Line 1658 void homogenize_order(struct order_spec *old,int n,str

Line 1671 void homogenize_order(struct order_spec *old,int n,str

int length,nv,row,i,j;

int **newm,**oldm;

struct order_spec *new;

int onv,nnv,nlen,olen,owlen;

struct weight_or_block *owb,*nwb;

*newp = new = (struct order_spec *)MALLOC(sizeof(struct order_spec));

switch ( old->id ) {

Line 1707 void homogenize_order(struct order_spec *old,int n,str

Line 1722 void homogenize_order(struct order_spec *old,int n,str

}

new->id = 2; new->nv = nv+1;

new->ord.matrix.row = row+1; new->ord.matrix.matrix = newm;

break;

case 3:

onv = old->nv;

nnv = onv+1;

olen = old->ord.composite.length;

nlen = olen+1;

owb = old->ord.composite.w_or_b;

nwb = (struct weight_or_block *)

MALLOC(nlen*sizeof(struct weight_or_block));

for ( i = 0; i < olen; i++ ) {

nwb[i].type = owb[i].type;

switch ( owb[i].type ) {

case IS_DENSE_WEIGHT:

owlen = owb[i].length;

nwb[i].length = owlen+1;

nwb[i].body.dense_weight = (int *)MALLOC((owlen+1)*sizeof(int));

for ( j = 0; j < owlen; j++ )

nwb[i].body.dense_weight[j] = owb[i].body.dense_weight[j];

nwb[i].body.dense_weight[owlen] = 0;

break;

case IS_SPARSE_WEIGHT:

nwb[i].length = owb[i].length;

nwb[i].body.sparse_weight = owb[i].body.sparse_weight;

break;

case IS_BLOCK:

nwb[i].length = owb[i].length;

nwb[i].body.block = owb[i].body.block;

break;

}

nwb[i].type = IS_SPARSE_WEIGHT;

nwb[i].body.sparse_weight =

(struct sparse_weight *)MALLOC(sizeof(struct sparse_weight));

nwb[i].body.sparse_weight[0].pos = onv;

nwb[i].body.sparse_weight[0].value = 1;

new->id = 3;

new->nv = nnv;

new->ord.composite.length = nlen;

new->ord.composite.w_or_b = nwb;

print_composite_order_spec(new);

break;

default:

error("homogenize_order : invalid input");

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>