copy_term
This commit is contained in:
Vítor Santos Costa
parent
a3dd1a1520
commit
93bb39d5f7
415
C/utilpreds.c
415
C/utilpreds.c
@ -8,10 +8,8 @@
|
|||||||
* *
|
* *
|
||||||
**************************************************************************
|
**************************************************************************
|
||||||
* *
|
* *
|
||||||
* File: utilpreds.c *
|
* File: utilpreds.c * Last rev: 4/03/88
|
||||||
* Last rev: 4/03/88 *
|
** mods: * comments: new utility predicates for YAP *
|
||||||
* mods: *
|
|
||||||
* comments: new utility predicates for YAP *
|
|
||||||
* *
|
* *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
#ifdef SCCS
|
#ifdef SCCS
|
||||||
@ -195,9 +193,9 @@ clean_complex_tr(tr_fr_ptr TR0 USES_REGS) {
|
|||||||
*pt = (CELL)RepAppl(v);
|
*pt = (CELL)RepAppl(v);
|
||||||
}
|
}
|
||||||
#ifndef FROZEN_STACKS
|
#ifndef FROZEN_STACKS
|
||||||
pt0 --;
|
pt0 --;
|
||||||
#endif /* FROZEN_STACKS */
|
#endif /* FROZEN_STACKS */
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#ifdef FROZEN_STACKS
|
#ifdef FROZEN_STACKS
|
||||||
pt[0] = TrailVal(pt0);
|
pt[0] = TrailVal(pt0);
|
||||||
@ -220,7 +218,7 @@ clean_complex_tr(tr_fr_ptr TR0 USES_REGS) {
|
|||||||
#define MIN_ARENA_SIZE (1048L)
|
#define MIN_ARENA_SIZE (1048L)
|
||||||
|
|
||||||
int Yap_copy_complex_term(register CELL *pt0, register CELL *pt0_end,
|
int Yap_copy_complex_term(register CELL *pt0, register CELL *pt0_end,
|
||||||
bool share, Term *split, bool copy_att_vars, CELL *ptf,
|
bool share, Term *split, bool copy_att_vars, CELL *ptf,
|
||||||
CELL *HLow USES_REGS) {
|
CELL *HLow USES_REGS) {
|
||||||
// fprintf(stderr,"+++++++++\n");
|
// fprintf(stderr,"+++++++++\n");
|
||||||
//CELL *x = pt0; while(x != pt0_end) Yap_DebugPlWriteln(*++ x);
|
//CELL *x = pt0; while(x != pt0_end) Yap_DebugPlWriteln(*++ x);
|
||||||
@ -265,11 +263,11 @@ int Yap_copy_complex_term(register CELL *pt0, register CELL *pt0_end,
|
|||||||
*ptf++ = AbsPair(RepAppl(*headp));
|
*ptf++ = AbsPair(RepAppl(*headp));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
*ptf = AbsPair(HR);
|
||||||
|
ptf++;
|
||||||
if (to_visit >= to_visit_max-32) {
|
if (to_visit >= to_visit_max-32) {
|
||||||
expand_stack(to_visit0, to_visit, to_visit_max, struct cp_frame);
|
expand_stack(to_visit0, to_visit, to_visit_max, struct cp_frame);
|
||||||
}
|
}
|
||||||
*ptf = AbsPair(HR);
|
|
||||||
ptf++;
|
|
||||||
to_visit->start_cp = pt0;
|
to_visit->start_cp = pt0;
|
||||||
to_visit->end_cp = pt0_end;
|
to_visit->end_cp = pt0_end;
|
||||||
to_visit->to = ptf;
|
to_visit->to = ptf;
|
||||||
@ -298,231 +296,232 @@ int Yap_copy_complex_term(register CELL *pt0, register CELL *pt0_end,
|
|||||||
ptd0 = pt0;
|
ptd0 = pt0;
|
||||||
goto deref;
|
goto deref;
|
||||||
} else if (IsApplTerm(d0)) {
|
} else if (IsApplTerm(d0)) {
|
||||||
register Functor f;
|
Functor f;
|
||||||
register CELL *headp, head;
|
CELL *headp, head;
|
||||||
/* store the terms to visit */
|
/* store the terms to visit */
|
||||||
headp = RepAppl(d0);
|
headp = RepAppl(d0);
|
||||||
head = *headp;
|
head = *headp;
|
||||||
|
|
||||||
if (IsPairTerm(head)//(share && headp < HB) ||
|
if (IsPairTerm(head)//(share && headp < HB) ||
|
||||||
) {
|
) {
|
||||||
if (split) {
|
if (split) {
|
||||||
Term v = Yap_MkNewApplTerm(FunctorEq, 2);
|
Term v = Yap_MkNewApplTerm(FunctorEq, 2);
|
||||||
RepAppl(v)[1] = head;
|
RepAppl(v)[1] = head;
|
||||||
*headp = *ptf++ = RepAppl(v)[0];
|
*headp = *ptf++ = RepAppl(v)[0];
|
||||||
o = MkPairTerm( v, o );
|
o = MkPairTerm( v, o );
|
||||||
} else {
|
} else {
|
||||||
/* If this is newer than the current term, just reuse */
|
/* If this is newer than the current term, just reuse */
|
||||||
*ptf++ = AbsAppl(RepPair(head));
|
*ptf++ = AbsAppl(RepPair(head));
|
||||||
|
}
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
continue;
|
if (IsApplTerm(head)//(share && headp < HB) ||
|
||||||
}
|
) {
|
||||||
if (IsApplTerm(head)//(share && headp < HB) ||
|
*ptf++ = head;
|
||||||
) {
|
continue;
|
||||||
*ptf++ = head;
|
}
|
||||||
continue;
|
f = (Functor)(head);
|
||||||
}
|
if (share && (ground || IsExtensionFunctor(f))) {
|
||||||
f = (Functor)(head);
|
|
||||||
|
|
||||||
if (IsExtensionFunctor(f)) {
|
|
||||||
if (share) {
|
|
||||||
*ptf++ = d0;
|
*ptf++ = d0;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
switch ((CELL)f) {
|
/* store the terms to visit */
|
||||||
case (CELL) FunctorDBRef:
|
to_visit->start_cp = pt0;
|
||||||
case (CELL) FunctorAttVar:
|
to_visit->end_cp = pt0_end;
|
||||||
*ptf++ = d0;
|
to_visit->to = ptf;
|
||||||
break;
|
to_visit->curp = headp;
|
||||||
case (CELL) FunctorLongInt:
|
to_visit->oldv = head;
|
||||||
if (HR > ASP - (MIN_ARENA_SIZE + 3)) {
|
to_visit->ground = ground;
|
||||||
goto overflow;
|
if (++to_visit >= to_visit_max-32) {
|
||||||
}
|
expand_stack(to_visit0, to_visit, to_visit_max, struct cp_frame);
|
||||||
*ptf++ = AbsAppl(HR);
|
}
|
||||||
HR[0] = (CELL)f;
|
*ptf = AbsAppl(HR);
|
||||||
HR[1] = headp[1];
|
ptf++;
|
||||||
HR[2] = EndSpecials;
|
ptf = HR;
|
||||||
HR += 3;
|
|
||||||
if (HR > ASP - MIN_ARENA_SIZE) {
|
if (IsExtensionFunctor(f)) {
|
||||||
goto overflow;
|
switch ((CELL)f) {
|
||||||
}
|
case (CELL) FunctorDBRef:
|
||||||
break;
|
case (CELL) FunctorAttVar:
|
||||||
case (CELL) FunctorDouble:
|
*ptf++ = d0;
|
||||||
if (HR >
|
break;
|
||||||
ASP - (MIN_ARENA_SIZE + (2 + SIZEOF_DOUBLE / sizeof(CELL)))) {
|
case (CELL) FunctorLongInt:
|
||||||
goto overflow;
|
if (HR > ASP - (MIN_ARENA_SIZE + 3)) {
|
||||||
}
|
goto overflow;
|
||||||
*ptf++ = AbsAppl(HR);
|
}
|
||||||
HR[0] = (CELL)f;
|
*ptf++ = AbsAppl(HR);
|
||||||
HR[1] = headp[1];
|
HR[0] = (CELL)f;
|
||||||
|
HR[1] = headp[1];
|
||||||
|
HR[2] = EndSpecials;
|
||||||
|
HR += 3;
|
||||||
|
if (HR > ASP - MIN_ARENA_SIZE) {
|
||||||
|
goto overflow;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case (CELL) FunctorDouble:
|
||||||
|
if (HR >
|
||||||
|
ASP - (MIN_ARENA_SIZE + (2 + SIZEOF_DOUBLE / sizeof(CELL)))) {
|
||||||
|
goto overflow;
|
||||||
|
}
|
||||||
|
*ptf++ = AbsAppl(HR);
|
||||||
|
HR[0] = (CELL)f;
|
||||||
|
HR[1] = headp[1];
|
||||||
#if SIZEOF_DOUBLE == 2 * SIZEOF_INT_P
|
#if SIZEOF_DOUBLE == 2 * SIZEOF_INT_P
|
||||||
HR[2] = headp[2];
|
HR[2] = headp[2];
|
||||||
HR[3] = EndSpecials;
|
HR[3] = EndSpecials;
|
||||||
HR += 4;
|
HR += 4;
|
||||||
#else
|
#else
|
||||||
HR[2] = EndSpecials;
|
HR[2] = EndSpecials;
|
||||||
HR += 3;
|
HR += 3;
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
case (CELL) FunctorString:
|
case (CELL) FunctorString:
|
||||||
if (ASP - HR < MIN_ARENA_SIZE + 3 + headp[1]) {
|
if (ASP - HR < MIN_ARENA_SIZE + 3 + headp[1]) {
|
||||||
goto overflow;
|
goto overflow;
|
||||||
}
|
}
|
||||||
*ptf++ = AbsAppl(HR);
|
*ptf++ = AbsAppl(HR);
|
||||||
memmove(HR, headp, sizeof(CELL) * (3 + headp[1]));
|
memmove(HR, headp, sizeof(CELL) * (3 + headp[1]));
|
||||||
HR += headp[1] + 3;
|
HR += headp[1] + 3;
|
||||||
break;
|
break;
|
||||||
default: {
|
default: {
|
||||||
/* big int */
|
/* big int */
|
||||||
size_t sz = (sizeof(MP_INT) + 3 * CellSize +
|
size_t sz = (sizeof(MP_INT) + 3 * CellSize +
|
||||||
((MP_INT *)(headp + 2))->_mp_alloc * sizeof(mp_limb_t)) /
|
((MP_INT *)(headp + 2))->_mp_alloc * sizeof(mp_limb_t)) /
|
||||||
CellSize,
|
CellSize,
|
||||||
i;
|
i;
|
||||||
|
|
||||||
if (HR > ASP - (MIN_ARENA_SIZE + sz)) {
|
if (HR > ASP - (MIN_ARENA_SIZE + sz)) {
|
||||||
goto overflow;
|
goto overflow;
|
||||||
}
|
}
|
||||||
*ptf++ = AbsAppl(HR);
|
*ptf++ = AbsAppl(HR);
|
||||||
HR[0] = (CELL)f;
|
HR[0] = (CELL)f;
|
||||||
for (i = 1; i < sz; i++) {
|
for (i = 1; i < sz; i++) {
|
||||||
HR[i] = headp[i];
|
HR[i] = headp[i];
|
||||||
|
|
||||||
|
}
|
||||||
|
HR += sz;
|
||||||
}
|
}
|
||||||
HR += sz;
|
}
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
if (share) {
|
||||||
|
TrailedMaBind(headp,AbsPair(HR));
|
||||||
|
} else {
|
||||||
|
*headp = AbsPair(HR);
|
||||||
}
|
}
|
||||||
continue;
|
if (split) {
|
||||||
}
|
// must be after trailing source term, so that we can check the source
|
||||||
*ptf = AbsAppl(HR);
|
// term and confirm it is still ok.
|
||||||
ptf++;
|
TrailedMaBind(ptf,AbsAppl(HR));
|
||||||
/* store the terms to visit */
|
}
|
||||||
to_visit->start_cp = pt0;
|
ptf = HR;
|
||||||
to_visit->end_cp = pt0_end;
|
ptf[-1] = (CELL)f;
|
||||||
to_visit->to = ptf;
|
ground = true;
|
||||||
to_visit->curp = headp;
|
arity_t a = ArityOfFunctor(f);
|
||||||
d0 = *headp;
|
HR = ptf+a;
|
||||||
to_visit->oldv = d0;
|
if (HR > ASP - MIN_ARENA_SIZE) {
|
||||||
to_visit->ground = ground;
|
goto overflow;
|
||||||
if (++to_visit >= to_visit_max-32) {
|
}
|
||||||
expand_stack(to_visit0, to_visit, to_visit_max, struct cp_frame);
|
pt0 = headp;
|
||||||
}
|
pt0_end = headp+a;
|
||||||
if (share) {
|
ground = (f != FunctorMutable);
|
||||||
TrailedMaBind(headp,AbsPair(HR));
|
|
||||||
} else {
|
} else {
|
||||||
*headp = AbsPair(HR);
|
/* just copy atoms or integers */
|
||||||
|
*ptf++ = d0;
|
||||||
}
|
}
|
||||||
if (split) {
|
continue;
|
||||||
// must be after trailing source term, so that we can check the source
|
|
||||||
// term and confirm it is still ok.
|
|
||||||
TrailedMaBind(ptf,AbsAppl(HR));
|
|
||||||
}
|
|
||||||
ptf = HR;
|
|
||||||
ptf[-1] = (CELL)f;
|
|
||||||
ground = true;
|
|
||||||
arity_t a = ArityOfFunctor(f);
|
|
||||||
HR = ptf+a;
|
|
||||||
if (HR > ASP - MIN_ARENA_SIZE) {
|
|
||||||
goto overflow;
|
|
||||||
}
|
|
||||||
pt0 = headp;
|
|
||||||
pt0_end = headp+a;
|
|
||||||
ground = (f != FunctorMutable);
|
|
||||||
} else {
|
|
||||||
/* just copy atoms or integers */
|
|
||||||
*ptf++ = d0;
|
|
||||||
}
|
}
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
derefa_body(d0, ptd0, copy_term_unk, copy_term_nvar);
|
derefa_body(d0, ptd0, copy_term_unk, copy_term_nvar);
|
||||||
ground = false;
|
ground = false;
|
||||||
/* don't need to copy variables if we want to share the global term */
|
/* don't need to copy variables if we want to share the global term */
|
||||||
if (//(share && ptd0 < HB && ptd0 > H0) ||
|
if (//(share && ptd0 < HB && ptd0 > H0) ||
|
||||||
(ptd0 >= HLow && ptd0 < HR)) {
|
(ptd0 >= HLow && ptd0 < HR)) {
|
||||||
/* we have already found this cell */
|
/* we have already found this cell */
|
||||||
*ptf++ = (CELL)ptd0;
|
*ptf++ = (CELL)ptd0;
|
||||||
} else {
|
} else {
|
||||||
if (copy_att_vars && GlobalIsAttachedTerm((CELL)ptd0)) {
|
if (copy_att_vars && GlobalIsAttachedTerm((CELL)ptd0)) {
|
||||||
/* if unbound, call the standard copy term routine */
|
/* if unbound, call the standard copy term routine */
|
||||||
struct cp_frame *bp;
|
struct cp_frame *bp;
|
||||||
CELL new;
|
CELL new;
|
||||||
|
|
||||||
bp = to_visit;
|
bp = to_visit;
|
||||||
if (!GLOBAL_attas[ExtFromCell(ptd0)].copy_term_op(ptd0, &bp,
|
if (!GLOBAL_attas[ExtFromCell(ptd0)].copy_term_op(ptd0, &bp,
|
||||||
ptf PASS_REGS)) {
|
ptf PASS_REGS)) {
|
||||||
goto overflow;
|
goto overflow;
|
||||||
}
|
|
||||||
to_visit = bp;
|
|
||||||
new = *ptf;
|
|
||||||
if (TR > (tr_fr_ptr)LOCAL_TrailTop - 256) {
|
|
||||||
/* Trail overflow */
|
|
||||||
if (!Yap_growtrail((TR - TR0) * sizeof(tr_fr_ptr *), TRUE)) {
|
|
||||||
goto trail_overflow;
|
|
||||||
}
|
}
|
||||||
|
to_visit = bp;
|
||||||
|
new = *ptf;
|
||||||
|
if (TR > (tr_fr_ptr)LOCAL_TrailTop - 256) {
|
||||||
|
/* Trail overflow */
|
||||||
|
if (!Yap_growtrail((TR - TR0) * sizeof(tr_fr_ptr *), TRUE)) {
|
||||||
|
goto trail_overflow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
TrailedMaBind(ptd0, new);
|
||||||
|
ptf++;
|
||||||
|
} else {
|
||||||
|
/* first time we met this term */
|
||||||
|
RESET_VARIABLE(ptf);
|
||||||
|
if ((ADDR)TR > LOCAL_TrailTop - MIN_ARENA_SIZE)
|
||||||
|
goto trail_overflow;
|
||||||
|
DO_TRAIL(ptd0, (CELL)ptf);
|
||||||
|
*ptd0 = (CELL)ptf;
|
||||||
|
ptf++;
|
||||||
}
|
}
|
||||||
TrailedMaBind(ptd0, new);
|
|
||||||
ptf++;
|
|
||||||
} else {
|
|
||||||
/* first time we met this term */
|
|
||||||
RESET_VARIABLE(ptf);
|
|
||||||
if ((ADDR)TR > LOCAL_TrailTop - MIN_ARENA_SIZE)
|
|
||||||
goto trail_overflow;
|
|
||||||
TrailedMaBind(ptd0, (CELL)ptf);
|
|
||||||
ptf++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/* Do we still have compound terms to visit */
|
||||||
|
if (to_visit > to_visit0) {
|
||||||
|
to_visit--;
|
||||||
|
if (!share)
|
||||||
|
*to_visit->curp = to_visit->oldv;
|
||||||
|
pt0 = to_visit->start_cp;
|
||||||
|
pt0_end = to_visit->end_cp;
|
||||||
|
ptf = to_visit->to;
|
||||||
|
ground = (ground && to_visit->ground);
|
||||||
|
goto loop;
|
||||||
|
}
|
||||||
|
|
||||||
/* Do we still have compound terms to visit */
|
/* restore our nice, friendly, term to its original state */
|
||||||
if (to_visit > to_visit0) {
|
clean_complex_tr(TR0 PASS_REGS);
|
||||||
to_visit--;
|
/* follow chain of multi-assigned variables */
|
||||||
if (!share)
|
pop_text_stack(lvl);
|
||||||
*to_visit->curp = to_visit->oldv;
|
return 0;
|
||||||
pt0 = to_visit->start_cp;
|
|
||||||
pt0_end = to_visit->end_cp;
|
|
||||||
ptf = to_visit->to;
|
|
||||||
ground = (ground && to_visit->ground);
|
|
||||||
goto loop;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* restore our nice, friendly, term to its original state */
|
|
||||||
clean_complex_tr(TR0 PASS_REGS);
|
|
||||||
/* follow chain of multi-assigned variables */
|
|
||||||
pop_text_stack(lvl);
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
|
|
||||||
overflow:
|
overflow:
|
||||||
/* oops, we're in trouble */
|
/* oops, we're in trouble */
|
||||||
HR = HLow;
|
HR = HLow;
|
||||||
/* we've done it */
|
/* we've done it */
|
||||||
/* restore our nice, friendly, term to its original state */
|
/* restore our nice, friendly, term to its original state */
|
||||||
HB = HB0;
|
HB = HB0;
|
||||||
while (to_visit > to_visit0) {
|
while (to_visit > to_visit0) {
|
||||||
to_visit--;
|
to_visit--;
|
||||||
pt0 = to_visit->start_cp;
|
pt0 = to_visit->start_cp;
|
||||||
pt0_end = to_visit->end_cp;
|
pt0_end = to_visit->end_cp;
|
||||||
ptf = to_visit->to;
|
ptf = to_visit->to;
|
||||||
}
|
}
|
||||||
reset_trail(TR0);
|
reset_trail(TR0);
|
||||||
pop_text_stack(lvl);
|
pop_text_stack(lvl);
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
trail_overflow:
|
trail_overflow:
|
||||||
/* oops, we're in trouble */
|
/* oops, we're in trouble */
|
||||||
HR = HLow;
|
HR = HLow;
|
||||||
/* we've done it */
|
/* we've done it */
|
||||||
/* restore our nice, friendly, term to its original state */
|
/* restore our nice, friendly, term to its original state */
|
||||||
HB = HB0;
|
HB = HB0;
|
||||||
while (to_visit > to_visit0) {
|
while (to_visit > to_visit0) {
|
||||||
to_visit--;
|
to_visit--;
|
||||||
pt0 = to_visit->start_cp;
|
pt0 = to_visit->start_cp;
|
||||||
pt0_end = to_visit->end_cp;
|
pt0_end = to_visit->end_cp;
|
||||||
ptf = to_visit->to;
|
ptf = to_visit->to;
|
||||||
}
|
}
|
||||||
reset_trail(TR0);
|
reset_trail(TR0);
|
||||||
pop_text_stack(lvl);
|
pop_text_stack(lvl);
|
||||||
return -4;
|
return -4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
34
C/write.c
34
C/write.c
@ -101,20 +101,22 @@ static bool callPortray(Term t, int sno USES_REGS) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define PROTECT(t, F) \
|
#define PROTECT(t, F) \
|
||||||
{ \
|
{ \
|
||||||
yhandle_t yt = Yap_InitHandle(t); \
|
yhandle_t yt = Yap_InitHandle(t); \
|
||||||
if (wglb->Write_Loops) { \
|
if (wglb->Write_Loops) { \
|
||||||
yhandle_t i; \
|
yhandle_t i; \
|
||||||
for (i=wglb->sl0;i<yt;i++) { \
|
for (i = yt - 1; i >= wglb->sl0; i--) { \
|
||||||
if (Yap_GetFromHandle(i) == t) { \
|
if (Yap_GetFromHandle(i) == t) { \
|
||||||
char buf[63]; snprintf(buf, 63, " @( ^^^%ld^^^ ) ",yt-i); \
|
char buf[63]; \
|
||||||
wrputs(buf,wglb->stream ); return; \
|
snprintf(buf, 63, " @{ ^^%ld } ", yt - i); \
|
||||||
} \
|
wrputs(buf, wglb->stream); \
|
||||||
} \
|
return; \
|
||||||
} \
|
} \
|
||||||
F; \
|
} \
|
||||||
t = Yap_PopHandle(yt);\
|
} \
|
||||||
|
F; \
|
||||||
|
t = Yap_PopHandle(yt); \
|
||||||
}
|
}
|
||||||
static void wrputn(Int, struct write_globs *);
|
static void wrputn(Int, struct write_globs *);
|
||||||
static void wrputf(Float, struct write_globs *);
|
static void wrputf(Float, struct write_globs *);
|
||||||
@ -711,11 +713,11 @@ static void write_var(CELL *t, struct write_globs *wglb,
|
|||||||
wrputs("$AT(", wglb->stream);
|
wrputs("$AT(", wglb->stream);
|
||||||
write_var(t, wglb, rwt);
|
write_var(t, wglb, rwt);
|
||||||
wrputc(',', wglb->stream);
|
wrputc(',', wglb->stream);
|
||||||
PROTECT(t, writeTerm(*l, 999, 1, FALSE, wglb, &nrwt));
|
PROTECT(*l, writeTerm(*l, 999, 1, FALSE, wglb, &nrwt));
|
||||||
attv = RepAttVar(t);
|
attv = RepAttVar(t);
|
||||||
wrputc(',', wglb->stream);
|
wrputc(',', wglb->stream);
|
||||||
l++;
|
l++;
|
||||||
PROTECT(t, writeTerm(*l, 999, 1, FALSE, wglb, &nrwt));
|
PROTECT(*l, writeTerm(*l, 999, 1, FALSE, wglb, &nrwt));
|
||||||
wrclose_bracket(wglb, TRUE);
|
wrclose_bracket(wglb, TRUE);
|
||||||
}
|
}
|
||||||
wglb->Portray_delays = TRUE;
|
wglb->Portray_delays = TRUE;
|
||||||
|
|||||||
@ -400,27 +400,23 @@ if (GMP_INCLUDE_DIRS)
|
|||||||
)
|
)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
include_directories(H
|
include_directories(
|
||||||
H/generated
|
${CMAKE_SOURCE_DIR}/H
|
||||||
include os OPTYap utf8proc JIT/HPP)
|
${CMAKE_SOURCE_DIR}/H/generated
|
||||||
include_directories(BEFORE ${CMAKE_BINARY_DIR})
|
${CMAKE_SOURCE_DIR}/include
|
||||||
|
${CMAKE_SOURCE_DIR}/os
|
||||||
add_subdirectory( H )
|
${CMAKE_SOURCE_DIR}/OPTYap
|
||||||
|
${CMAKE_SOURCE_DIR}/utf8proc
|
||||||
set_directory_properties( PROPERTIES INCLUDE_DIRECTORIES
|
${CMAKE_SOURCE_DIR}/JIT/HPP
|
||||||
H
|
|
||||||
H/generated
|
|
||||||
include
|
|
||||||
os
|
|
||||||
OPTYap
|
|
||||||
utf8proc
|
|
||||||
JIT/HPP
|
|
||||||
${GMP_INCLUDE_DIRS}
|
${GMP_INCLUDE_DIRS}
|
||||||
${READLINE_LIBRARIES}
|
${READLINE_LIBRARIES}
|
||||||
${SQLITE_LIBRARIES}
|
${SQLITE_LIBRARIES}
|
||||||
${ANDROID_LIBRARIES}
|
${ANDROID_LIBRARIES}
|
||||||
|
${CMAKE_BINARY_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_subdirectory( H )
|
||||||
|
|
||||||
#MPI STUFF
|
#MPI STUFF
|
||||||
# library/mpi/mpi.c library/mpi/mpe.c
|
# library/mpi/mpi.c library/mpi/mpe.c
|
||||||
# library/lammpi/yap_mpi.c library/lammpi/hash.c library/lammpi/prologterms2c.c
|
# library/lammpi/yap_mpi.c library/lammpi/hash.c library/lammpi/prologterms2c.c
|
||||||
|
|||||||
@ -5,7 +5,6 @@ set (PROGRAMS
|
|||||||
dtproblog.yap
|
dtproblog.yap
|
||||||
aproblog.yap
|
aproblog.yap
|
||||||
problog_learning.yap
|
problog_learning.yap
|
||||||
problog_lbfgs.yap
|
|
||||||
problog_learning_lbdd.yap
|
problog_learning_lbdd.yap
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -2453,8 +2453,8 @@ uses local dynamic predicates max_probability/1 and max_proof/1
|
|||||||
problog_max(Goal, Prob, Facts) :-
|
problog_max(Goal, Prob, Facts) :-
|
||||||
problog_flag(first_threshold,InitT),
|
problog_flag(first_threshold,InitT),
|
||||||
init_problog_max(InitT),
|
init_problog_max(InitT),
|
||||||
problog_control(off,up),
|
problog_control(off,up), %
|
||||||
problog_max_id(Goal, Prob, FactIDs),theo todo
|
problog_max_id(Goal, Prob, FactIDs), %theo todo
|
||||||
( FactIDs = [_|_] -> get_fact_list(FactIDs, Facts);
|
( FactIDs = [_|_] -> get_fact_list(FactIDs, Facts);
|
||||||
Facts = FactIDs).
|
Facts = FactIDs).
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user