diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1294 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
rslopes 2005-05-26 18:03:08 +00:00
parent e1b2820d21
commit 35357f7f17
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
C/stdpreds.c
View File

@ -11,8 +11,14 @@
* File: stdpreds.c * * File: stdpreds.c *
* comments: General-purpose C implemented system predicates * * comments: General-purpose C implemented system predicates *
* * * *
* Last rev: $Date: 2005-04-27 20:09:25 $,$Author: vsc $ * * Last rev: $Date: 2005-05-26 18:01:11 $,$Author: rslopes $ *
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.88 2005/04/27 20:09:25 vsc
* indexing code could get confused with suspension points
* some further improvements on oveflow handling
* fix paths in Java makefile
* changs to support gibbs sampling in CLP(BN)
*
* Revision 1.87 2005/04/07 17:48:55 ricroc * Revision 1.87 2005/04/07 17:48:55 ricroc
* Adding tabling support for mixed strategy evaluation (batched and local scheduling) * Adding tabling support for mixed strategy evaluation (batched and local scheduling)
* UPDATE: compilation flags -DTABLING_BATCHED_SCHEDULING and -DTABLING_LOCAL_SCHEDULING removed. To support tabling use -DTABLING in the Makefile or --enable-tabling in configure. * UPDATE: compilation flags -DTABLING_BATCHED_SCHEDULING and -DTABLING_LOCAL_SCHEDULING removed. To support tabling use -DTABLING in the Makefile or --enable-tabling in configure.
@ -361,11 +367,12 @@ showprofres(UInt type) {
/* First part: Read information about predicates and store it on yap trail */ /* First part: Read information about predicates and store it on yap trail */
FPreds=fopen(profile_names(PROFPREDS_FILE),"r"); FPreds=fopen(profile_names(PROFPREDS_FILE),"r");
if (FPreds == NULL) { printf("Sorry, profiler couldn't find PROFPREDS file. \n"); return FALSE; } if (FPreds == NULL) { printf("Sorry, profiler couldn't find PROFPREDS file. \n"); return FALSE; }
ProfPreds=0; ProfPreds=0;
pr=(clauseentry *) TR; pr=(clauseentry *) TR;
while (fscanf(FPreds,"+%p %p %p %ld",&(pr->beg),&(pr->end),&(pr->pp),&(pr->ts)) > 0){ while (fscanf(FPreds,"+%p %p %p %d",&(pr->beg),&(pr->end),&(pr->pp),&(pr->ts)) > 0){
int c; int c;
pr->pcs = 0L; pr->pcs = 0L;
pr++; pr++;

8
H/Heap.h
View File

@ -10,7 +10,7 @@
* File: Heap.h * * File: Heap.h *
* mods: * * mods: *
* comments: Heap Init Structure * * comments: Heap Init Structure *
* version: $Id: Heap.h,v 1.78 2005-01-28 23:14:38 vsc Exp $ * * version: $Id: Heap.h,v 1.79 2005-05-26 18:03:08 rslopes Exp $ *
*************************************************************************/ *************************************************************************/
/* information that can be stored in Code Space */ /* information that can be stored in Code Space */
@ -414,7 +414,7 @@ typedef struct various_codes {
struct AliasDescS * file_aliases; struct AliasDescS * file_aliases;
#if LOW_PROF #if LOW_PROF
int profiler_on; int profiler_on;
void *f_prof, *f_preds; FILE *f_prof, *f_preds;
UInt prof_preds; UInt prof_preds;
#endif /* LOW_PROF */ #endif /* LOW_PROF */
struct reduction_counters call_counters; struct reduction_counters call_counters;
@ -674,8 +674,8 @@ struct various_codes *Yap_heap_regs;
#define FileAliases Yap_heap_regs->file_aliases #define FileAliases Yap_heap_regs->file_aliases
#if LOW_PROF #if LOW_PROF
#define ProfilerOn Yap_heap_regs->profiler_on #define ProfilerOn Yap_heap_regs->profiler_on
#define FProf ((FILE *)Yap_heap_regs->f_prof) #define FProf Yap_heap_regs->f_prof
#define FPreds ((FILE *)Yap_heap_regs->f_preds) #define FPreds Yap_heap_regs->f_preds
#define ProfPreds Yap_heap_regs->prof_preds #define ProfPreds Yap_heap_regs->prof_preds
#endif /* LOW_PROF */ #endif /* LOW_PROF */
#define ReductionsCounter Yap_heap_regs->call_counters.reductions #define ReductionsCounter Yap_heap_regs->call_counters.reductions