From aaee1881495d0e5bae0e4027b48d2d62d6d5c0f1 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Mon, 11 Jan 2021 21:23:31 +0100
Subject: do not silently ignore duplicate train entries (wip)

---
 bin/umlauf-to-dot | 60 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 22 deletions(-)

(limited to 'bin/umlauf-to-dot')

diff --git a/bin/umlauf-to-dot b/bin/umlauf-to-dot
index 1ac2c2e..860c962 100755
--- a/bin/umlauf-to-dot
+++ b/bin/umlauf-to-dot
@@ -67,9 +67,11 @@ sub build_cycle {
 
 		my @candidates;
 
-		if ( my $c = $map->{$train_number}{cycle}{$cycle_id} ) {
-			push( @candidates, @{ $c->{from} // [] } );
-			push( @candidates, @{ $c->{to}   // [] } );
+		for my $train ( @{ $map->{$train_number} } ) {
+			if ( my $c = $train->{cycle}{$cycle_id} ) {
+				push( @candidates, @{ $c->{from} // [] } );
+				push( @candidates, @{ $c->{to}   // [] } );
+			}
 		}
 
 		@candidates = uniq @candidates;
@@ -87,29 +89,39 @@ sub build_cycle {
 	my @output;
 
 	for my $train_number (@train_numbers) {
-		if ( my $c = $map->{$train_number}{cycle}{$cycle_id} ) {
-			for my $from ( @{ $c->{from} // [] } ) {
-				push(
-					@output,
-					sprintf( "%s -> %s;",
-						format_train( $from,         $map->{$from} ),
-						format_train( $train_number, $map->{$train_number} ) )
-				);
-			}
-			for my $to ( @{ $c->{to} // [] } ) {
-				push(
-					@output,
-					sprintf( "%s -> %s;",
-						format_train( $train_number, $map->{$train_number} ),
-						format_train( $to,           $map->{$to} ) )
-				);
+		for my $train ( @{ $map->{$train_number} } ) {
+			if ( my $c = $train->{cycle}{$cycle_id} ) {
+				for my $from ( @{ $c->{from} // [] } ) {
+					push(
+						@output,
+						sprintf(
+							"%s -> %s;",
+							format_train( $from, $map->{$from}[0] ),
+							format_train(
+								$train_number, $map->{$train_number}[0]
+							)
+						)
+					);
+				}
+				for my $to ( @{ $c->{to} // [] } ) {
+					push(
+						@output,
+						sprintf(
+							"%s -> %s;",
+							format_train(
+								$train_number, $map->{$train_number}[0]
+							),
+							format_train( $to, $map->{$to}[0] )
+						)
+					);
+				}
 			}
 		}
 		if ( $train_number != $line ) {
 			push(
 				@output,
 				sprintf( "%s [shape=box];",
-					format_train( $train_number, $map->{$train_number} ) )
+					format_train( $train_number, $map->{$train_number}[0] ) )
 			);
 		}
 	}
@@ -117,7 +129,11 @@ sub build_cycle {
 	return @output;
 }
 
-my @cycle_ids = keys %{ $map->{$line}{cycle} // {} };
+my @cycle_ids;
+
+for my $train ( @{ $map->{$line} } ) {
+	push( @cycle_ids, keys %{ $train->{cycle} // {} } );
+}
 
 say "digraph Umlauf {";
 
@@ -125,6 +141,6 @@ for my $cycle_id (@cycle_ids) {
 	say join( "\n", uniq build_cycle( $line, $cycle_id ) );
 }
 
-printf( "%s [style=bold];\n", format_train( $line, $map->{$line} ) );
+printf( "%s [style=bold];\n", format_train( $line, $map->{$line}[0] ) );
 
 say "}"
-- 
cgit v1.2.3