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

- Cycle detection seems to be working.

Browse Source
This commit is contained in:
ccremers 2004-08-15 14:57:50 +00:00
parent 28782548b0
commit c7e290197c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arachne.c
View File

@ -363,8 +363,6 @@ bind_new_run (const Goal goal, const Protocol p, const Role r,
int run; int run;
int flag; int flag;
Roledef rd; Roledef rd;
int old_run;
int old_index;
roleInstance (sys, p, r, NULL); roleInstance (sys, p, r, NULL);
run = sys->maxruns - 1; run = sys->maxruns - 1;

9
src/binding.c
View File

@ -5,6 +5,7 @@
#include "list.h" #include "list.h"
#include "system.h" #include "system.h"
#include "binding.h" #include "binding.h"
#include "warshall.h"
#include "memory.h" #include "memory.h"
/* /*
@ -34,7 +35,7 @@ static System sys;
//! Create mem for binding //! Create mem for binding
Binding Binding
binding_create (int run_from, int ev_from, int run_to, int ev_to, int manual) binding_create (int run_from, int ev_from, int run_to, int ev_to)
{ {
Binding b; Binding b;
@ -117,9 +118,9 @@ node_number (int run, int ev)
node = ev; node = ev;
while (run > 0) while (run > 0)
{ {
run--;
//!@todo This now reference to step, but we intend "length" as in Arachne. //!@todo This now reference to step, but we intend "length" as in Arachne.
node = node + sys->runs[run].step; node = node + sys->runs[run].step;
run--;
} }
return node; return node;
} }
@ -187,7 +188,6 @@ closure_graph (Binding b)
= 1; = 1;
bl = bl->next; bl = bl->next;
} }
return warshall (graph, nodes); return warshall (graph, nodes);
} }
@ -202,7 +202,8 @@ binding_add (int run_from, int ev_from, int run_to, int ev_to)
{ {
Binding b; Binding b;
b = binding_create (run_from, ev_from, run_to, ev_to, 1); b = binding_create (run_from, ev_from, run_to, ev_to);
eprintf ("Adding binding (%i,%i) --->> (%i,%i)\n",run_from, ev_from, run_to, ev_to);
sys->bindings = list_insert (sys->bindings, b); sys->bindings = list_insert (sys->bindings, b);
/* /*