===== Comparing ../a21 with ../a20-download =====
capillary.txt changed (diff ../a20-download/capillary.txt ../a21/capillary.txt)
46,53d45
< param xxx;
< param yyy;
< param xx{NODES};
< param yy{NODES};
< param x{1..T,NODES};
< param y{1..T,NODES};
< param a{NODES} default Uniform(0,2*PI);
<
config.txt changed (diff ../a20-download/config.txt ../a21/config.txt)
56c56
< param randseed = 970;
---
> param randseed = 1010;
58,59c58,59
< param N = 130;
< param T = 160;
---
> param N = 20;
> param T = 10;
randomwalk.txt changed (diff ../a20-download/randomwalk.txt ../a21/randomwalk.txt)
0a1,9
> param xxx;
> param yyy;
> param xx{NODES};
> param yy{NODES};
> param x{1..T,NODES};
> param y{1..T,NODES};
> param a{NODES} default Uniform(0,2*PI);
>
>
slideshow.txt changed (diff ../a20-download/slideshow.txt ../a21/slideshow.txt)
6c6
< #end;
---
> end;
20,24c20,24
< print "Creating MPEG file ...";
< shell ("convert" &
< " -page " & page_width & "x" & page_height &
< " diagram/out.ps" &
< " diagram/out.mpeg");
---
> #print "Creating MPEG file ...";
> #shell ("convert" &
> # " -page " & page_width & "x" & page_height &
> # " diagram/out.ps" &
> # " diagram/out.mpeg");
===== Comparing ../a22 with ../a21 =====
capillary.txt changed (diff ../a21/capillary.txt ../a22/capillary.txt)
4a5
> commands config-randomwalk.txt;
7,8d7
< option randseed (randseed);
<
11,14c10
<
< set NODES = 1..N;
< param source_node in NODES, default 1;
< param sink_node in NODES, != source_node, default int(N/2)+1;
---
> commands randomwalk.txt;
20d15
< set LINKS{1..T} dimen 2 within NODES cross NODES;
43,44d37
< maximize Flow:
< sum{t in FRAMES} F[t];
46d38
< commands randomwalk.txt;
48,55c40,41
< param distance{i in NODES,j in NODES: j>i} = (x[1,j]-x[1,i])^2+(y[1,j]-y[1,i])^2;
< param max_distance = max{(i,j) in {i in NODES,j in NODES: j>i}} distance[i,j];
< for{(i,j) in {i in NODES,j in NODES: j>i}: distance[i,j] = max_distance}
< {
< let source_node := i;
< let sink_node := j;
< break;
< }
---
> maximize Flow:
> sum{t in FRAMES} F[t];
config-randomwalk.txt [new]
config.txt changed (diff ../a21/config.txt ../a22/config.txt)
1d0
< param N integer, >=2;
17,19d15
< param x_max;
< param y_max;
< param T;
31d26
< param randseed;
34,39d28
< param step;
< param walk;
< param PI = 4*atan(1);
< param r_norm = sqrt(x_max*y_max/N/PI);
< param r_coef;
< param r = r_coef*r_norm;
49,50d37
< param x_max = 200;
< param y_max = 200;
56,62d42
< param randseed = 1010;
< param r_coef = 3.1;
< param N = 20;
< param T = 10;
< param step = 1.1;
< param walk = 15;
<
diagram.txt changed (diff ../a21/diagram.txt ../a22/diagram.txt)
4a5
> shell "copy config-randomwalk.txt diagram";
randomwalk.txt changed (diff ../a21/randomwalk.txt ../a22/randomwalk.txt)
0a1,2
> option randseed (randseed);
>
62a65,73
> param distance{i in NODES,j in NODES: j>i} = (x[1,j]-x[1,i])^2+(y[1,j]-y[1,i])^2;
> param max_distance = max{(i,j) in {i in NODES,j in NODES: j>i}} distance[i,j];
> for{(i,j) in {i in NODES,j in NODES: j>i}: distance[i,j] = max_distance}
> {
> let source_node := i;
> let sink_node := j;
> break;
> }
>
===== Comparing ../a23 with ../a22 =====
config-randomwalk.txt changed (diff ../a22/config-randomwalk.txt ../a23/config-randomwalk.txt)
0a1,3
> param pname symbolic;
> param fname symbolic = "data/" & pname & ".txt";
>
config.txt changed (diff ../a22/config.txt ../a23/config.txt)
1,2d0
< param pname symbolic;
< param fname symbolic = "data/" & pname & ".txt";
randomwalk.txt changed (diff ../a22/randomwalk.txt ../a23/randomwalk.txt)
73a74,85
> let pname := "LINKS";
> display LINKS > (fname);
> close (fname);
>
> table randomwalk OUT "ODBC" "data/randomwalk.xls":
> [], x_max, y_max, N, T, source_node, sink_node;
> write table randomwalk;
>
> table coordinates OUT "ODBC" "data/coordinates.xls":
> {1..T,NODES} -> [Timeframes,NODES], x,y;
> write table coordinates;
>
===== Comparing ../a24 with ../a23 =====
capillary.txt changed (diff ../a23/capillary.txt ../a24/capillary.txt)
1c1
< #Copyright (c) 2005 EPFL/Switzernet/Intarnet by Emin Gabrielyan
---
> #Copyright (c) 2006 EPFL/Switzernet/Intarnet by Emin Gabrielyan
3a4
> option presolve 1;
8c9,18
< option presolve 1;
---
> table randomwalk IN "ODBC" "data/randomwalk.xls":
> [], x_max, y_max, N, T, source_node, sink_node;
> read table randomwalk;
>
> let pname := "LINKS";
> data (fname);
>
> table coordinates IN "ODBC" "data/coordinates.xls":
> [Timeframes,NODES], x,y;
> read table coordinates;
10c20
< commands randomwalk.txt;
---
> #commands randomwalk.txt;
config-randomwalk.txt changed (diff ../a23/config-randomwalk.txt ../a24/config-randomwalk.txt)
20a21,23
> param x{1..T,NODES};
> param y{1..T,NODES};
>
randomwalk.txt changed (diff ../a23/randomwalk.txt ../a24/randomwalk.txt)
7,8d6
< param x{1..T,NODES};
< param y{1..T,NODES};
===== Comparing ../a25 with ../a24 =====
capillary.txt changed (diff ../a24/capillary.txt ../a25/capillary.txt)
9c9,11
< table randomwalk IN "ODBC" "data/randomwalk.xls":
---
> printf " loading parameters\r\n";
>
> table params IN "ODBC" "data/randomwalk.mdb":
11c13,32
< read table randomwalk;
---
> read table params;
>
> set LINKS3D dimen 3;
>
> printf " loading links\r\n";
>
> table links OUT "ODBC" "data/randomwalk2.mdb":
> LINKS3D <- [Timeframe,i,j];
> read table links;
>
> reset data LINKS;
> for{t in 1..T}
> let LINKS[t] := {(t,i,j) in LINKS3D};
>
>
> #end;
>
> #let pname := "LINKS";
> #data (fname);
>
13,14c34
< let pname := "LINKS";
< data (fname);
---
> printf " loading coordinates\r\n";
16,17c36,37
< table coordinates IN "ODBC" "data/coordinates.xls":
< [Timeframes,NODES], x,y;
---
> table coordinates IN "ODBC" "data/randomwalk.mdb":
> [Timeframe,NODES], x,y;
config-randomwalk.txt changed (diff ../a24/config-randomwalk.txt ../a25/config-randomwalk.txt)
32,33c32,33
< param N = 20;
< param T = 10;
---
> param N = 300;
> param T = 100;
randomwalk.txt changed (diff ../a24/randomwalk.txt ../a25/randomwalk.txt)
71a72,73
> printf " saving links (txt)\r\n";
>
76c78,80
< table randomwalk OUT "ODBC" "data/randomwalk.xls":
---
> printf " saving parameters (mdb)\r\n";
>
> table params OUT "ODBC" "data/randomwalk.mdb":
78c82,83
< write table randomwalk;
---
> write table params;
>
80,81c85,88
< table coordinates OUT "ODBC" "data/coordinates.xls":
< {1..T,NODES} -> [Timeframes,NODES], x,y;
---
> printf " saving coordinates (mdb)\r\n";
>
> table coordinates OUT "ODBC" "data/randomwalk.mdb":
> {1..T,NODES} -> [Timeframe,NODES], x,y;
83a91,96
> printf " saving links (mdb)\r\n";
>
> table links OUT "ODBC" "data/randomwalk2.mdb":
> {t in 1..T, LINKS[t]} -> [Timeframe,i,j];
> write table links;
>
readme.txt [new]
===== Comparing ../a26 with ../a25 =====
capillary.txt changed (diff ../a25/capillary.txt ../a26/capillary.txt)
9,10d8
< printf " loading parameters\r\n";
<
15,27d12
< set LINKS3D dimen 3;
<
< printf " loading links\r\n";
<
< table links OUT "ODBC" "data/randomwalk2.mdb":
< LINKS3D <- [Timeframe,i,j];
< read table links;
<
< reset data LINKS;
< for{t in 1..T}
< let LINKS[t] := {(t,i,j) in LINKS3D};
<
<
30,34c15,16
< #let pname := "LINKS";
< #data (fname);
<
<
< printf " loading coordinates\r\n";
---
> let pname := "LINKS";
> data (fname);
config-randomwalk.txt changed (diff ../a25/config-randomwalk.txt ../a26/config-randomwalk.txt)
30c30
< param randseed = 1010;
---
> param randseed = 1020;
32,33c32,33
< param N = 300;
< param T = 100;
---
> param N = 100;
> param T = 10;
main.txt [new]
randomwalk.txt changed (diff ../a25/randomwalk.txt ../a26/randomwalk.txt)
0a1,4
> reset;
>
> commands config-randomwalk.txt;
>
72,78c76
< printf " saving links (txt)\r\n";
<
< let pname := "LINKS";
< display LINKS > (fname);
< close (fname);
<
< printf " saving parameters (mdb)\r\n";
---
> printf " (3) saving parameters (mdb)\n";
83a82
> printf " (4) saving links (txt)\n";
85c84,88
< printf " saving coordinates (mdb)\r\n";
---
> let pname := "LINKS";
> display LINKS > (fname);
> close (fname);
>
> printf " (5) saving coordinates (mdb)\n";
91,96d93
< printf " saving links (mdb)\r\n";
<
< table links OUT "ODBC" "data/randomwalk2.mdb":
< {t in 1..T, LINKS[t]} -> [Timeframe,i,j];
< write table links;
<
===== Comparing ../a27 with ../a26 =====
ac36-aron.txt changed (diff ../a26/ac36-aron.txt ../a27/ac36-aron.txt)
6a7,10
> table params IN "ODBC" "data/randomwalk.mdb":
> [], N, T;
> read table params;
>
aron-config.txt changed (diff ../a26/aron-config.txt ../a27/aron-config.txt)
9c9
< param chunks = 8;
---
> param chunks = 1;
capillary-config.txt [new]
capillary.txt changed (diff ../a26/capillary.txt ../a27/capillary.txt)
6,7c6
< commands config-randomwalk.txt;
< commands config.txt;
---
> commands capillary-config.txt;
10c9
< [], x_max, y_max, N, T, source_node, sink_node;
---
> [], N, T, source_node, sink_node, randseed;
13,14d11
< #end;
<
18,22d14
< table coordinates IN "ODBC" "data/randomwalk.mdb":
< [Timeframe,NODES], x,y;
< read table coordinates;
<
< #commands randomwalk.txt;
295,301d286
< let file := "dump/flow.txt";
< display layers > (file);
< display pump > (file);
< display BOTTLENECKS > (file);
< display flow_outs > (file);
< close (file);
<
303,304d287
< printf "param T = %d;\n\n",T > (file);
< printf "param N = %d;\n\n",N > (file);
323,333d305
< #end;
<
< print "Drawing...";
<
< param ps symbolic = "diagram/out.ps";
< param layer;
< param diagram_pos;
<
< commands linkviews_load.txt;
< commands diagram.txt;
< commands slideshow.txt;
diagram-config.txt [new]
diagram.txt changed (diff ../a26/diagram.txt ../a27/diagram.txt)
0a1,3
> reset;
> commands diagram-config.txt;
>
5c8
< shell "copy config-randomwalk.txt diagram";
---
> shell "copy randomwalk-config.txt diagram";
13a17,39
>
>
> table params IN "ODBC" "data/randomwalk.mdb":
> [], x_max, y_max, source_node, sink_node, N, T;
> read table params;
>
>
> table coordinates IN "ODBC" "data/randomwalk.mdb":
> [Timeframe,NODES], x,y;
> read table coordinates;
>
>
> param layers{1..T} default 0;
> param pump{t in 1..T, 1..layers[t]};
> set BOTTLENECKS{t in 1..T,1..layers[t]} dimen 2;
> set PATH{t in 1..T,1..layers[t]} dimen 2;
> set INITLINKS{1..T} dimen 2;
> param load{t in 1..T, l in 1..layers[t], (i,j) in PATH[t,l]} >=0;
>
> data dump/path.txt;
>
>
>
206a233,236
>
> table page OUT "ODBC" "data/diagram.xls":
> [], page_width, page_height;
> write table page;
linkvew-config.txt [new]
linkviews_load.txt changed (diff ../a26/linkviews_load.txt ../a27/linkviews_load.txt)
0a1,2
> commands linkvew-config.txt;
>
linkviews_make.txt changed (diff ../a26/linkviews_make.txt ../a27/linkviews_make.txt)
1c1,7
< commands config.txt;
---
> reset;
>
> param pname symbolic;
> param fname symbolic = "data/" & pname & ".txt";
>
>
> commands linkvew-config.txt;
main.txt changed (diff ../a26/main.txt ../a27/main.txt)
3a4,12
>
> model linkviews_make.txt;
>
> model diagram.txt;
>
> model slideshow.txt;
>
> model ac36-aron.txt;
>
randomwalk-config.txt [new]
randomwalk.txt changed (diff ../a26/randomwalk.txt ../a27/randomwalk.txt)
0a1,2
> #Copyright (c) 2006 EPFL/Switzernet/Intarnet by Emin Gabrielyan
>
3c5
< commands config-randomwalk.txt;
---
> commands randomwalk-config.txt;
79c81
< [], x_max, y_max, N, T, source_node, sink_node;
---
> [], x_max, y_max, N, T, source_node, sink_node, randseed;
slideshow-config.txt [new]
slideshow.txt changed (diff ../a26/slideshow.txt ../a27/slideshow.txt)
0a1,12
> reset;
> commands slideshow-config.txt;
>
> table page IN "ODBC" "data/diagram.xls":
> [], page_width, page_height;
> read table page;
>
> table params IN "ODBC" "data/randomwalk.mdb":
> [], T;
> read table params;
>
>
===== Comparing ../a28 with ../a27 =====
aron.txt [new]
capillary-config.txt changed (diff ../a27/capillary-config.txt ../a28/capillary-config.txt)
20a21
>
21a23,25
> param solvelog symbolic;
>
>
27c31,32
< param log = "model.log";
---
> param log = "capillary-model.log";
> param solvelog = "capillary-solvelog.csv";
capillary.txt changed (diff ../a27/capillary.txt ../a28/capillary.txt)
261d260
<
280,287c279
< shell "rmdir /s /q dump";
< shell "mkdir dump";
< shell "del /q dump\*";
< shell "copy config.txt dump";
< shell "copy solvelog.csv dump";
< shell "copy model.log dump";
<
< let file := "dump/path.txt";
---
> let file := "data/flow.txt";
diagram-config.txt changed (diff ../a27/diagram-config.txt ../a28/diagram-config.txt)
25c25
< commands linkviews_load.txt;
---
> commands linkviews-load.txt;
diagram.txt changed (diff ../a27/diagram.txt ../a28/diagram.txt)
7,8c7
< shell "copy config.txt diagram";
< shell "copy randomwalk-config.txt diagram";
---
> shell "copy *config.txt diagram";
36c35
< data dump/path.txt;
---
> data data/flow.txt;
linkviews-config.txt [new]
linkviews-load.txt [new]
linkviews-make.txt [new]
main.txt changed (diff ../a27/main.txt ../a28/main.txt)
5c5
< model linkviews_make.txt;
---
> model linkviews-make.txt;
11c11
< model ac36-aron.txt;
---
> model aron.txt;
solve.txt changed (diff ../a27/solve.txt ../a28/solve.txt)
7,8d6
< let file := "solvelog.csv";
<
11c9
< remove (file);
---
> remove (solvelog);
25c23
< >> (file);
---
> >> (solvelog);
41c39
< >> (file);
---
> >> (solvelog);
43c41
< close (file);
---
> close (solvelog);
===== Comparing ../a29 with ../a28 =====
aron-config.txt changed (diff ../a28/aron-config.txt ../a29/aron-config.txt)
12a13,15
> param time1 symbolic = ctime();
> param time2 symbolic = substr(time1,9,2)&" "&substr(time1,5,3)&" "&substr(time1,21,4)&" "&substr(time1,12,8);
>
aron.txt changed (diff ../a28/aron.txt ../a29/aron.txt)
104c104
< ver,sub(ctime(),"^ *[^ ]* *",""),benchmark_info,benchmark_stop-benchmark_start);
---
> ver,time2,benchmark_info,benchmark_stop-benchmark_start);
147c147,148
< shell ("copy aron-config.txt " & dir);
---
> shell ("copy aron-config.txt " & dir & " > nul");
> shell ("copy randomwalk-config.txt " & dir & " > nul");
189a191,192
> reset data time1;
> reset data time2;
capillary-config.txt changed (diff ../a28/capillary-config.txt ../a29/capillary-config.txt)
1,12d0
< param pname symbolic;
< param fname symbolic = "data/" & pname & ".txt";
<
< param N integer, >=2;
< param T;
<
< set NODES = 1..N;
< set LINKS{1..T} dimen 2 within NODES cross NODES;
< param source_node in NODES;
< param sink_node in NODES, != source_node;
<
<
15d2
<
19,25d5
<
< param file symbolic;
<
< param log symbolic;
< param solvelog symbolic;
<
<
28a9,11
> param buildlog symbolic;
> param solvelog symbolic;
>
31c14
< param log = "capillary-model.log";
---
> param buildlog = "capillary-buildlog.log";
34c17,20
< model;
\ No newline at end of file
---
> model;
>
> param time1 symbolic = ctime();
> param time2 symbolic = substr(time1,9,2)&" "&substr(time1,5,3)&" "&substr(time1,21,4)&" "&substr(time1,12,8);
capillary.txt changed (diff ../a28/capillary.txt ../a29/capillary.txt)
5a6
> commands network-config.txt;
67c68
< printf "\nlayering:\n" > (log);
---
> printf "\nlayering:\n" > (buildlog);
70,71c71,72
< printf "\n layer %d:\n",l > (log);
< printf " %-8s %d\n","frames",card(FRAMES) > (log);
---
> printf "\n layer %d:\n",l > (buildlog);
> printf " %-8s %d\n","frames",card(FRAMES) > (buildlog);
77c78
< printf " %-8s %f\n","max-flow",Flow > (log);
---
> printf " %-8s %f\n","max-flow",Flow > (buildlog);
123c124
< printf " hunting bottlenecks:\n" > (log);
---
> printf " hunting bottlenecks:\n" > (buildlog);
127,129c128,130
< printf " hunt %d:\n",hunt > (log);
< printf " %-8s %d\n","frames",card(FRAMES) > (log);
< printf " %-8s %d\n","core",sum{t in FRAMES} card(Core[t]) > (log);
---
> printf " hunt %d:\n",hunt > (buildlog);
> printf " %-8s %d\n","frames",card(FRAMES) > (buildlog);
> printf " %-8s %d\n","core",sum{t in FRAMES} card(Core[t]) > (buildlog);
131c132
< printf " %-8s %f\n","min-cost",Cost > (log);
---
> printf " %-8s %f\n","min-cost",Cost > (buildlog);
154c155
< printf " preparing the next layer:\n" > (log);
---
> printf " preparing the next layer:\n" > (buildlog);
166c167
< card({t in FRAMES, i in NODES: abs(flow_out_incr[t,i])>0}) > (log);
---
> card({t in FRAMES, i in NODES: abs(flow_out_incr[t,i])>0}) > (buildlog);
187c188
< card({t in FRAMES, Core[t]}) > (log);
---
> card({t in FRAMES, Core[t]}) > (buildlog);
198c199
< printf " zeroed flow outs %d\n",counter > (log);
---
> printf " zeroed flow outs %d\n",counter > (buildlog);
216c217
< printf " calibrated flow outs %d\n",counter > (log);
---
> printf " calibrated flow outs %d\n",counter > (buildlog);
227c228
< printf " zeroed flow outs %d\n",counter > (log);
---
> printf " zeroed flow outs %d\n",counter > (buildlog);
236c237
< printf " all done in (sec) %f\n",benchmark_stop - benchmark_start > (log);
---
> printf " all done in (sec) %f\n",benchmark_stop - benchmark_start > (buildlog);
258,259c259,260
< printf "\nlayering completed.\n" > (log);
< close (log);
---
> printf "\nlayering completed.\n" > (buildlog);
> close (buildlog);
267a269,270
> param file symbolic;
>
269c272,276
< if num(sub(ctime(),"^.* [0-9]+:[0-9]+:([0-9]+) .*$","\1")) mod 5 == 0 then
---
>
> reset data time1;
> reset data time2;
>
> if num(sub(time1,"^.* [0-9]+:[0-9]+:([0-9]+) .*$","\1")) mod 5 == 0 then
272c279
< printf "%s,%.5f,%.5f,%d,%s,%d,%d,%d,%d\n", sub(ctime(),"^[^ ]* ",""),
---
> printf "%s,%.5f,%.5f,%d,%s,%d,%d,%d,%d\n", time2,
278d284
<
diagram-config.txt changed (diff ../a28/diagram-config.txt ../a29/diagram-config.txt)
1,6d0
< print "Drawing...";
<
< param pname symbolic;
< param fname symbolic = "data/" & pname & ".txt";
<
< param N integer, >=2;
9,14d2
< param T;
<
< set NODES = 1..N;
< set LINKS{1..T} dimen 2 within NODES cross NODES;
< param source_node in NODES;
< param sink_node in NODES, != source_node;
19d6
<
21,23d7
< param layer;
< param diagram_pos;
<
diagram.txt changed (diff ../a28/diagram.txt ../a29/diagram.txt)
0a1,2
> #Copyright (c) 2006 EPFL/Switzernet/Intarnet by Emin Gabrielyan
>
1a4,6
> print "Drawing...";
>
> commands network-config.txt;
7c12
< shell "copy *config.txt diagram";
---
> shell "copy randomwalk-config.txt diagram > nul";
16,17d20
<
<
22d24
<
27d28
<
37c38,39
<
---
> param layer;
> param diagram_pos;
network-config.txt [new]
randomwalk-config.txt changed (diff ../a28/randomwalk-config.txt ../a29/randomwalk-config.txt)
1,4d0
< param pname symbolic;
< param fname symbolic = "data/" & pname & ".txt";
<
< param N integer, >=2;
7d2
< param T;
16,19d10
< set NODES = 1..N;
< set LINKS{1..T} dimen 2 within NODES cross NODES;
< param source_node in NODES;
< param sink_node in NODES, != source_node;
32,33c23,24
< param N = 8;
< param T = 50;
---
> param N = 110;
> param T = 10;
randomwalk.txt changed (diff ../a28/randomwalk.txt ../a29/randomwalk.txt)
4a5
> commands network-config.txt;
slideshow-config.txt changed (diff ../a28/slideshow-config.txt ../a29/slideshow-config.txt)
5d4
< param file symbolic;
slideshow.txt changed (diff ../a28/slideshow.txt ../a29/slideshow.txt)
114c114
<
---
> param file symbolic;
solve.txt changed (diff ../a28/solve.txt ../a29/solve.txt)
25a26,27
> reset data time1;
> reset data time2;
27c29
< sub(ctime(),"^[^ ]* ",""),
---
> time2,
===== Comparing ../a30 with ../a29 =====
aron-config.txt changed (diff ../a29/aron-config.txt ../a30/aron-config.txt)
9c9
< param chunks = 1;
---
> param chunks = 4;
capillary.txt changed (diff ../a29/capillary.txt ../a30/capillary.txt)
132a133
> printf " %-8s %f\n","bottlene",sum{t in FRAMES_true diff FRAMES} card(Core[t]) > (buildlog);
randomwalk-config.txt changed (diff ../a29/randomwalk-config.txt ../a30/randomwalk-config.txt)
18,19c18,19
< param x_max = 200;
< param y_max = 200;
---
> param x_max = 250;
> param y_max = 250;
21c21
< param randseed = 1040;
---
> param randseed = 1050;
23,24c23,24
< param N = 110;
< param T = 10;
---
> param N = 9;
> param T = 300;
slideshow.txt changed (diff ../a29/slideshow.txt ../a30/slideshow.txt)
18,24d17
< end;
<
< print "Creating PNG files ...";
< shell ("convert" &
< " -page " & page_width & "x" & page_height &
< " diagram/out.ps" &
< " diagram/out-%d.png");
31a25,26
> end;
>
37a33,38
> print "Creating PNG files ...";
> shell ("convert" &
> " -page " & page_width & "x" & page_height &
> " diagram/out.ps" &
> " diagram/out-%d.png");
>