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

Visualisation improvement: role variables get priority in assigning concrete values.

Browse Source 
Previously, if a local (non-role) variable would have (implicit) agent type,
it would be assigned a concrete term before the roles. This would lead to
non-optimal choices, since we care more about the role instantiations than about other variables.

However, when making traces concrete, we use the run's 'locals' list. Because of
the way this is constructed (in reverse), non-role variables precede the role variables.
We therefore choose to traverse the list in reverse.
This commit is contained in:
Cas Cremers 2014-06-30 23:11:39 +01:00
parent b0e5128e23
commit 6374683d17
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/arachne.c
View File

@ -1849,12 +1849,12 @@ chooseBestCandidate (Termlist candidatelist, Term var)
* - seen is a termlist that contains newly generated terms (usage: seen = createNewTerm(seen,.. ) * - seen is a termlist that contains newly generated terms (usage: seen = createNewTerm(seen,.. )
* - typeterm is the type name term (e.g., "Agent" term, "Data" in case not clear.) * - typeterm is the type name term (e.g., "Agent" term, "Data" in case not clear.)
* - isagent is a boolean that is true iff we are looking for an agent name from the initial knowledge for a role * - isagent is a boolean that is true iff we are looking for an agent name from the initial knowledge for a role
* - var is the variable term * - var is the variable term of which we use the name
* *
* Output: the first element of the returned list, which is otherwise equal to seen. * Output: the first element of the returned list, which is otherwise equal to seen.
*/ */
Termlist Termlist
createNewTerm (Termlist seen, Term typeterm, int isagent, Term var) createNewTerm (Termlist seen, Term typeterm, int isagent, Term nameterm)
{ {
/* Does if have an explicit type? /* Does if have an explicit type?
* If so, we try to find a fresh name from the intruder knowledge first. * If so, we try to find a fresh name from the intruder knowledge first.
@ -1868,7 +1868,7 @@ createNewTerm (Termlist seen, Term typeterm, int isagent, Term var)
{ {
Term t; Term t;
t = chooseBestCandidate (candidatelist, var); t = chooseBestCandidate (candidatelist, nameterm);
termlistDelete (candidatelist); termlistDelete (candidatelist);
return termlistPrepend (seen, t); return termlistPrepend (seen, t);
} }
@ -1912,24 +1912,27 @@ makeTraceConcrete (const System sys)
changedvars = NULL; changedvars = NULL;
tlnew = findUsedConstants (sys); tlnew = findUsedConstants (sys);
run = 0;
while (run < sys->maxruns) for (run = 0; run < sys->maxruns; run++)
{ {
Termlist tl; Termlist tl;
tl = sys->runs[run].locals; for (tl = termlistForward (sys->runs[run].locals); tl != NULL;
while (tl != NULL) tl = tl->prev)
{ {
Term basevar;
basevar = tl->term;
/* variable, and of some run? */ /* variable, and of some run? */
if (isTermVariable (tl->term) && TermRunid (tl->term) >= 0) if (isTermVariable (basevar) && TermRunid (basevar) >= 0)
{ {
Term var; Term var;
Term name; Term name;
Termlist vartype; Termlist vartype;
var = deVar (tl->term); var = deVar (basevar);
vartype = var->stype; vartype = basevar->stype;
// Determine class name // Determine class name
if (vartype != NULL) if (vartype != NULL)
{ {
@ -1943,15 +1946,14 @@ makeTraceConcrete (const System sys)
} }
// We should turn this into an actual term // We should turn this into an actual term
tlnew = tlnew =
createNewTerm (tlnew, name, isAgentType (var->stype), var); createNewTerm (tlnew, name, isAgentType (var->stype),
basevar);
var->subst = tlnew->term; var->subst = tlnew->term;
// Store for undo later // Store for undo later
changedvars = termlistAdd (changedvars, var); TERMLISTADD (changedvars, var);
} }
tl = tl->next;
} }
run++;
} }
termlistDelete (tlnew); termlistDelete (tlnew);
return changedvars; return changedvars;