--- rat/client/Attic/code.html 2000/07/04 16:25:22 1.6 +++ rat/client/Attic/code.html 2000/08/19 19:47:30 1.11 @@ -9,7 +9,7 @@ Resource Assembly Tool 1/7,1/8,1/10,1/14,1/15,1/16,1/21,1/22,1/29,1/30,1/31, 2/2,2/3,2/10,2/12,2/13,2/14,2/15,2/17,2/18,2/19,2/20,2/21,2/22, 5/2,5/3,5/4,5/5,5/6,5/8,5/9,5/13,5/18,5/20,5/22,5/24,5/25, -6/7,6/8,6/9,6/10,6/12,6/15,7/4 +6/7,6/8,6/9,6/10,6/12,6/15,7/4,7/26,7/28,7/31,8/5,8/19 Gerd Kortemeyer with Scott Harrison --> @@ -56,6 +56,14 @@ var zscale=3; var disrows=0; var discols=0; +var finishdone=0; +var tim=0; +var funny='|'; +var reqaction=''; +var canceltim; + +var expense=0; + var data1=new Array(1024); var data2=new Array(1024); var data3=new Array(1024); @@ -69,6 +77,7 @@ var inf; function insertrow(j,ex1,ex2) { var kj; stored=0; + expense++; expense++; objects1=''; objects2=''; for (kj=0;kj<=maxrow;kj++) { @@ -214,6 +223,7 @@ function insertcol(j) { if ( col[kj]>j ) { col[kj]++; } } maxcol++; + expense++; expense++; col[maxcol]=j+1; } @@ -337,7 +347,6 @@ function comingthru (jid,kid,dkid) { function insertport (obj1,d,inout,linkobj) { - var k; var port; var revport; stored=0; data1=obj[obj1].split('&'); @@ -416,6 +425,7 @@ function insertport (obj1,d,inout,linkob function addobj(kjid,objs) { stored=0; + expense++; if (rowcont[kjid]!='') { rowcont[kjid]+=':'; } rowcont[kjid]+=obj.length; obj[obj.length]=objs; @@ -475,6 +485,7 @@ function delobj(obj1) { } } } + obj[obj1]=''; } // --------------------------------------------------------- Garbage collection @@ -621,22 +632,65 @@ function dellink (linknr) { // Links obj1 with obj2, creates new objlink, marks all elements with number function joinres (obj1,obj2,cond) { - var k; var kr; var outcol; var incol; var d; stored=0; + var minexpense; + var best; + + expense=0; + tryjoin(obj1,obj2,cond,1,1); + minexpense=expense; + best=0; + finishload(); + + expense=0; + tryjoin(obj1,obj2,cond,1,-1); + if (expense'); - for (kr=0;kr<=maxrow;kr++) { + for (kr=0;kr<=maxrow;kr++) { message("Generating Output Row "+kr); drawrow(rrow[kr]); } @@ -1689,11 +1743,12 @@ function graphreset() { insertcol(-1); objcont[0]=''; - objcont[1]='Start::false:start:res' - objcont[2]='Finish::false:finish:res'; objlinks[0]=''; - objlinks[1]='1:2:0'; - + if (((objcont[1]==undefined)&&(objcont[2]==undefined)) || + ((objcont[1]=='')&&(objcont[2]==''))) { + objcont[1]='Start::false:start:res' + objcont[2]='Finish::false:finish:res'; + } graphdef='no'; } @@ -2003,7 +2058,7 @@ function simpletabledraw() { // ---------------------------------- Sort objects to straighten graph or table function sortobjs() { - message("Sorting Resources"); + message("Sorting Resources: "+funny); var k; var ij; var dol; @@ -2021,6 +2076,8 @@ function sortobjs() { } if (objsort.length==0) { return ''; } for (k=1;k