Changeset 83

Timestamp:

Jun 22, 2008, 11:23:39 PM (17 years ago)

Author:

hajdam

Message:

Dokončení levé topologie s přehazováním vydlic

File:

• www/is/topologie-gen.php (modified) (7 diffs)

www/is/topologie-gen.php

@@ -2 +2 @@
  // Skript pro generování grafu stromové struktury sítě do PNG obrázku
 include('../global2.php');
-global $Database;
+global $Database, $debug;
 
 if(array_key_exists('debug', $_GET)) $debug = $_GET['debug'];
 else $debug = 0;
-// $debug = 0;
+$debug = 0;
 
 class treeitem {
@@ -35 +35 @@
   function getFirst() {
     if (count($this->children)>0) {
+      if (count($this->order)>0) {
+        if (count($this->children[0]->children)>0) return $this->order[$this->children[0]->index];
+      }
       return $this->children[0];
     } else return null;
@@ -41 +44 @@
   function getLast() {
     if (count($this->children)>0) {
+      if (count($this->order)>0) {
+        if (count($this->children[count($this->children)-1]->children)>0) return $this->order[$this->children[count($this->children)-1]->index];
+      }
       return $this->children[count($this->children)-1];
     } else return null;
@@ -142 +148 @@
 
   function reorder($node) {
+    global $debug;
     $node->pos = $this->border[$node->level];
     $this->border[$node->level]++;
@@ -160 +167 @@
         }
       }
-      if ($node->forkcnt > 0) echo $node->index.':'.$node->forkcnt."\n";
       for($i=0;$i<$node->forkcnt-1;$i++) {
         for($j=0;$j<count($forkmap);$j++) {
@@ -197 +203 @@
         }
         $order[$target]=$forkmap[$bestfit];
-        echo 'ORDER: '.$target.' > '.$forkmap[$bestfit]->index."\n";
+        if ($debug) echo 'ORDER: '.$target.' > '.$forkmap[$bestfit]->index."\n";
         array_splice($forkmap, $bestfit, 1);
       }
       $order[$lastindex]=$forkmap[0];
-      echo 'ORDER: '.$lastindex.' > '.$forkmap[0]->index."\n";
+      if ($debug) echo 'ORDER: '.$lastindex.' > '.$forkmap[0]->index."\n";
+      if ($debug) echo 'ORDERSTORE: '.$node->index."\n";
       $node->order = $order;
       $this->border = $preborder;
@@ -213 +220 @@
       foreach($node->children as $key => $value) {
         if ((count($value->children)>0) && count($order)>0) {
-          echo $node->index.' '.$value->index."\n";
           $value = $order[$value->index];
         }