Changeset 283

Timestamp:

Sep 25, 2017, 8:32:54 PM (7 years ago)

Author:

g7moreau

Message:

• Add modulo parameter to shift node in graph (to many switch children)

Location:

trunk

Files:

• klask (modified) (5 diffs)
• push-web (modified) (1 diff)

trunk/klask

@@ -2731 +2731 @@
 
    my $format = 'txt';
+   my $modulo = 0;
 
    GetOptions(
       'format|f=s'  => \$format,
+      'modulo|m=i'  => \$modulo,
       );
 
@@ -2743 +2745 @@
    $format = 'txt' if not defined $possible_format{$format};
 
-   $possible_format{$format}->(@ARGV);
+   $possible_format{$format}->($modulo, @ARGV);
    return;
    }
@@ -2790 +2792 @@
 #---------------------------------------------------------------
 sub cmd_exportsw_dot {
+   my $modulo = shift;
 
    my $switch_connection = YAML::Syck::LoadFile("$KLASK_SW_FILE");
@@ -2873 +2876 @@
                print "\"$sw:$port_connect\" -> \"$sw\" [len=2, style=bold, color=$color, arrowhead=normal, arrowtail=inv];\n";
                
-               $db_switch_line{$sw}++;
+               #$db_switch_line{$sw}++;
                #if ($db_switch_line{$sw} % 9 == 0) {
                #   # Create invisible node
@@ -2919 +2922 @@
             printf "   \"%s:%s\" -> \"%s:%s\" [style=$style, color=$color];\n", $sw, $db_switch_output_port{$sw}, $sw_connect, $port_connect;
 
-            if ($db_switch_line{$sw_connect} % 9 == 0) {
+            next if $modulo == 0; # No shift (invisible nodes) in graph
+            $db_switch_line{$sw_connect}++;
+            if ($db_switch_line{$sw_connect} % $modulo == 0) {
                # Create invisible node
                $invisible_node++;

trunk/push-web

@@ -45 +45 @@
 
 
-$KLASK exportsw --format dot > ${TMP}/switch-map.txt
+$KLASK exportsw --format dot --modulo 9 > ${TMP}/switch-map.txt