patrick/madagascar
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Print more statistics

Browse Source
This commit is contained in:
Patrick Lühne 2018-01-25 17:48:56 +01:00
parent e960f0d764
commit 46bdb212de
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clausesets.c
View File

@ -1524,7 +1524,7 @@ int solve0(satinstance sati,int conflictstogo,int restart) {
sati->value = 0; sati->value = 0;
return 0; return 0;
SAT: SAT:
printf("SAT (%i decisions %i conflicts)\n",sati->decisions,sati->conflicts); printf("SAT (%i ID %i decisions %i conflicts %i variables)\n",sati->id,sati->decisions,sati->conflicts,sati->nOfVars);
#ifdef COSTS #ifdef COSTS
printf("FINAL COST %i.\n",sati->currentcost); printf("FINAL COST %i.\n",sati->currentcost);
sati->costbound = sati->currentcost; sati->costbound = sati->currentcost;

4
main.c
View File

@ -736,10 +736,10 @@ int main(int argc,char **argv) {
printf("max. learned clause length %i\n",stats_longest_learned); printf("max. learned clause length %i\n",stats_longest_learned);
if(flagOutputDIMACS == 0) { if(flagOutputDIMACS == 0) {
printf("t val conflicts decisions\n"); printf("t val conflicts decisions variables\n");
i = 0; i = 0;
do { do {
printf("%i %i %i %i\n",seqs[i].sati->nOfTPoints-1,seqs[i].sati->value,seqs[i].sati->conflicts,seqs[i].sati->decisions); printf("%i %i %i %i %i\n",seqs[i].sati->nOfTPoints-1,seqs[i].sati->value,seqs[i].sati->conflicts,seqs[i].sati->decisions,seqs[i].sati->nOfVars);
i += 1; i += 1;
} while(i*outputTimeStep+firstTimePoint <= lastTimePoint && seqs[i].sati && seqs[i-1].sati->value != 1); } while(i*outputTimeStep+firstTimePoint <= lastTimePoint && seqs[i].sati && seqs[i-1].sati->value != 1);
// } while(i*outputTimeStep+firstTimePoint < lastTimePoint); // } while(i*outputTimeStep+firstTimePoint < lastTimePoint);