rat/client/code.html - diff

Return to code.html CVS log

Up to [LON-CAPA] / rat / client

Diff for /rat/client/Attic/code.html between versions 1.9 and 1.10

-version 1.9, 2000/07/31 15:36:22
+version 1.10, 2000/08/02 15:27:10
  Line 62  var funny='|';
  var reqaction='';
  var canceltim;
+ var expense=0;
  var data1=new Array(1024);
  var data2=new Array(1024);
  var data3=new Array(1024);
- Line 75  var inf;
+ Line 77  var inf;
  function insertrow(j,ex1,ex2) {
     var kj;
     stored=0;
+    expense++; expense++;
     objects1='';
     objects2='';
     for (kj=0;kj<=maxrow;kj++) {
- Line 220  function insertcol(j) {
+ Line 223  function insertcol(j) {
        if ( col[kj]>j ) { col[kj]++; }
     }
     maxcol++;
+    expense++; expense++;
     col[maxcol]=j+1;
  }
- Line 422  function insertport (obj1,d,inout,linkob
+ Line 426  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;
- Line 627  function dellink (linknr) {
+ Line 632  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<minexpense) {
+       best=1;
+       minexpense=expense;
+    }
+    finishload();
+    expense=0;
+    tryjoin(obj1,obj2,cond,-1,1);
+    if (expense<minexpense) {
+       best=2;
+       minexpense=expense;
+    }
+    finishload();
+    expense=0;
+    tryjoin(obj1,obj2,cond,-1,-1);
+    if (expense<minexpense) {
+       best=3;
+       minexpense=expense;
+    }
+    if (best==0) {
+       finishload();
+       tryjoin(obj1,obj2,cond,1,1);
+    }
+    if (best==1) {
+       finishload();
+       tryjoin(obj1,obj2,cond,1,-1);
+    }
+    if (best==2) {
+       finishload();
+       tryjoin(obj1,obj2,cond,-1,1);
+    }
+ }
+ function tryjoin(obj1,obj2,cond,d1,d2) {
+    var k; var kr; var outcol; var incol; var d;
     dest=objlinks.length;
     objlinks[dest]=obj1+':'+obj2+':'+cond;
-    data3=obj[obj1].split('&');
-    sum=0;
+    outcol=insertport(obj1,d1,2,dest);
-    for (k=2;k<data3.length;k++) { sum+=col[data3[k].split(':')[0]]; }
-    outmiddle=sum/(data3.length-2);
-    data3=obj[obj2].split('&');
-    sum=0;
-    for (k=2;k<data3.length;k++) { sum+=col[data3[k].split(':')[0]]; }
-    inmiddle=sum/(data3.length-2);
-    d=inmiddle-outmiddle;
-    outcol=insertport(obj1,d,2,dest);
     insertcond(obj1,outcol,cond);
-    incol=insertport(obj2,-d,1,dest);
+    incol=insertport(obj2,d2,1,dest);
     if (row[inrow]==(row[outrow]+1)) {
        insertrow(row[outrow],-1,-1);
     }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.9
changed lines
	Added in v.1.10