Can now graph 'best' networks.

jgamble · Apr 6, 2016 · 8a6a096 · 8a6a096
1 parent 40a9e39
commit 8a6a096
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/eg/eps.pl b/eg/eps.pl
@@ -1,5 +1,6 @@
 use Getopt::Long;
 use Algorithm::Networksort;
+use Algorithm::Networksort::Best qw(:all);
 
 use strict;
 use warnings;
@@ -13,6 +14,7 @@
 	foreground => undef,
 );
 my $alg = 'bosenelson';
+my($nw, $best);
 
 GetOptions('compbegin=s' => \$colorset{compbegin},
 	'compend=s' => \$colorset{compend},
@@ -22,11 +24,19 @@
 	'inputline=s'=> \$colorset{inputline},
 	'foreground=s' => \$colorset{foreground},
 	'algorithm=s' => \$alg,
+	'best=s' => \$best,
 );
 
 my $inputs = $ARGV[0] || 8;
 
-my $nw = nwsrt(inputs => $inputs, algorithm => $alg);
+if (defined $best)
+{
+	$nw = nwsrt_best(name => $best);
+}
+else
+{
+	$nw = nwsrt(inputs => $inputs, algorithm => $alg);
+}
 
 $nw->colorsettings(%colorset);
 

diff --git a/eg/svg.pl b/eg/svg.pl
@@ -1,5 +1,6 @@
 use Getopt::Long;
 use Algorithm::Networksort;
+use Algorithm::Networksort::Best qw(:all);
 
 use strict;
 use warnings;
@@ -11,8 +12,10 @@
 	inputend => undef,
 	inputline => undef,
 	foreground => undef,
+	background => undef,
 );
 my $alg = 'bosenelson';
+my($nw, $best);
 
 GetOptions('compbegin=s' => \$colorset{compbegin},
 	'compend=s' => \$colorset{compend},
@@ -21,12 +24,22 @@
 	'inputend=s' => \$colorset{inputend},
 	'inputline=s'=> \$colorset{inputline},
 	'foreground=s' => \$colorset{foreground},
+	'background=s' => \$colorset{background},
 	'algorithm=s' => \$alg,
+	'best=s' => \$best,
 );
 
 my $inputs = $ARGV[0] || 8;
 
-my $nw = nwsrt(inputs => $inputs, algorithm => $alg);
+if (defined $best)
+{
+	$nw = nwsrt_best(name => $best);
+}
+else
+{
+	$nw = nwsrt(inputs => $inputs, algorithm => $alg);
+}
+
 
 $nw->colorsettings(%colorset);
 

diff --git a/eg/text.pl b/eg/text.pl
@@ -1,5 +1,6 @@
 use Getopt::Long;
 use Algorithm::Networksort;
+use Algorithm::Networksort::Best qw(:all);
 
 use strict;
 use warnings;
@@ -12,6 +13,7 @@
 	inputline => undef,
 );
 my $alg = 'bosenelson';
+my($nw, $best);
 
 GetOptions(
 	'compbegin=s' => \$txtset{compbegin},
@@ -21,11 +23,19 @@
 	'inputend=s' => \$txtset{inputend},
 	'inputline=s' => \$txtset{inputline},
 	'algorithm=s' => \$alg,
+	'best=s' => \$best,
 );
 
 my $inputs = $ARGV[0] || 8;
 
-my $nw = nwsrt(inputs => $inputs, algorithm => $alg);
+if (defined $best)
+{
+	$nw = nwsrt_best(name => $best);
+}
+else
+{
+	$nw = nwsrt(inputs => $inputs, algorithm => $alg);
+}
 
 #
 # Ensure we're only passing in set parameters. And, if it's defined