OpenXM_contrib2/asir2018/engine/nd.c - diff

Return to nd.c CVS log

Up to [local] / OpenXM_contrib2 / asir2018 / engine

Diff for /OpenXM_contrib2/asir2018/engine/nd.c between version 1.58 and 1.59

version 1.58, 2021/12/07 08:58:08

version 1.59, 2021/12/14 01:02:40

Line 1

/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.57 2021/12/07 08:48:34 noro Exp $ */

/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.58 2021/12/07 08:58:08 noro Exp $ */

#include "nd.h"

Line 2505 void setup_hpdata(HPDATA final,HPDATA current)

final->n = n = nd_nvar;

final->hn = (P)BDY(nd_hpdata);

#if 0

if ( NEXT(nd_hpdata) != 0 && (weight=(LIST)BDY(NEXT(nd_hpdata))) != 0 ) {

wlen = length(BDY(weight));

if ( n != wlen )

Line 2514 void setup_hpdata(HPDATA final,HPDATA current)

Line 2515 void setup_hpdata(HPDATA final,HPDATA current)

w[i] = ZTOS((Z)BDY(nd));

} else

w = 0;

#else

w = current_dl_weight_vector;

#endif

MKVECT(x,n);

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

NEWDL(dl,n); dl->d[i] = 1; dl->td = 1; BDY(x)[i] = dl;

Line 2712 get_eg(&eg2); add_eg(&eg_update,&eg1,&eg2);

Line 2716 get_eg(&eg2); add_eg(&eg_update,&eg1,&eg2);

fprintf(asir_out,"We found a gb\n");

d = 0;

}

if ( dg > sugar ) {

// printexpr(CO,(Obj)current_hpdata.hn);

fprintf(asir_out,"\n");

}

sugar0 = sugar;

while ( d && dg > sugar0 ) {

if ( DP_Print ) fprintf(asir_out,"sugar=%d done.\n",sugar0);

if ( DP_Print ) { fprintf(asir_out,"[%d]",sugar0); fflush(asir_out); }

d = nd_remove_same_sugar(d,sugar0);

sugar0++;

}

Line 3519 again: