andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed some more problems. Seems to be stable, although pruning is not

Browse Source 
sufficient. Investigate bke-broken.
This commit is contained in:
ccremers 2004-08-19 15:30:31 +00:00
parent f2bc78cc1f
commit bd84625ae4
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/arachne.c
View File

@ -1135,6 +1135,18 @@ prune_theorems ()
} }
return 1; return 1;
} }
if ( sys->match < 2 && ( term_encryption_level (b->term) > max_encryption_level))
{
// Prune: we do not need to construct such terms
if (sys->output == PROOF)
{
indentPrint ();
eprintf ("Pruned because the encryption level of ");
termPrint (b->term);
eprintf (" is too high.\n");
}
return 1;
}
bl = bl->next; bl = bl->next;
} }
@ -1151,23 +1163,26 @@ prune_bounds ()
Termlist tl; Termlist tl;
List bl; List bl;
if (indentDepth > 20)
{
// Hardcoded limit on iterations
if (sys->output == PROOF)
{
indentPrint ();
eprintf ("Pruned because too many iteration levels.\n");
}
return 1;
}
if (num_regular_runs > sys->switchRuns) if (num_regular_runs > sys->switchRuns)
{ {
// Hardcoded limit on runs // Hardcoded limit on runs
if (sys->output == PROOF) if (sys->output == PROOF)
{ {
indentPrint (); indentPrint ();
eprintf ("Pruned because too many regular runs.\n"); eprintf ("Pruned: too many regular runs (%i).\n", num_regular_runs);
}
return 1;
}
// This needs some foundation. Probably * 2^max_encryption_level
//!@todo Fix this bound
if ((sys->match < 2) && (num_intruder_runs > ((double) sys->switchRuns * max_encryption_level * 8)))
{
// Hardcoded limit on iterations
if (sys->output == PROOF)
{
indentPrint ();
eprintf ("Pruned: %i intruder runs is too much. (max encr. level %i)\n", num_intruder_runs, max_encryption_level);
} }
return 1; return 1;
} }