From 41b7940cf9b29673c815bed7299d49417384c64a Mon Sep 17 00:00:00 2001
From: Joseph Rios <Joseph.L.Rios@nasa.gov>
Date: Fri, 5 Jan 2024 18:45:01 -0800
Subject: [PATCH] Reduce branches further.

---
 src/dw_rounding.c | 65 +++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/dw_rounding.c b/src/dw_rounding.c
index 032edda..66fd6d7 100644
--- a/src/dw_rounding.c
+++ b/src/dw_rounding.c
@@ -441,43 +441,42 @@ void print_zeros(int_thread_data* my_data) {
 		}
 
 		/* SAME FLIGHT AS BEFORE. */
-		else
-		{ /* Same flight. */
-			// printf("same flight.\n");
-			if (strcmp(curr_sector, prev_sector) != 0)
-			{ /* New sector. */
-				if (curr_delay > prev_delay)
-				{ /* New delay. */
-					new_delay = curr_delay - prev_delay;
-					prev_delay = curr_delay;
-					// printf("NEW DELAY: Flight %s, Sector %s, %d minutes.\n", curr_flight, old_sector, new_delay);
-					// printf("%s %s %d\n", curr_flight, old_sector, new_delay);
-					// printf("%s %s %d\n", curr_flight, old_sector, new_delay);
-					fprintf(my_data->zero_file, "%s %s %d\n", curr_flight, old_sector, new_delay);
-				}
-				else
-				{ /* No new delay. */
-					prev_delay = curr_delay;
-				}
-
-				if (ground_delay)
-				{
-					ground_delay = 0;
-					// printf("NEW_DELAY: Flight %s, Sector %s, %d minutes.\n", curr_flight, prev_sector, curr_delay);
-					// printf("%s %s %d\n", curr_flight, prev_sector, curr_delay);
-					fprintf(my_data->zero_file, "%s %s %d\n", curr_flight, prev_sector, curr_delay);
-				}
-
-				strcpy(old_sector, prev_sector);
-				strcpy(prev_sector, curr_sector);
-				curr_delay = 1;
+		else if (strcmp(curr_sector, prev_sector) != 0)
+		{ /* Same flight and new sector */
+			//if (strcmp(curr_sector, prev_sector) != 0)
+			//{ /* New sector. */
+			if (curr_delay > prev_delay)
+			{ /* New delay. */
+				new_delay = curr_delay - prev_delay;
+				prev_delay = curr_delay;
+				// printf("NEW DELAY: Flight %s, Sector %s, %d minutes.\n", curr_flight, old_sector, new_delay);
+				// printf("%s %s %d\n", curr_flight, old_sector, new_delay);
+				// printf("%s %s %d\n", curr_flight, old_sector, new_delay);
+				fprintf(my_data->zero_file, "%s %s %d\n", curr_flight, old_sector, new_delay);
 			}
 			else
-			{ /* Same sector as before. */
-				// printf("Incrementing curr_delay.\n");
-				curr_delay++;
+			{ /* No new delay. */
+				prev_delay = curr_delay;
+			}
+
+			if (ground_delay)
+			{
+				ground_delay = 0;
+				// printf("NEW_DELAY: Flight %s, Sector %s, %d minutes.\n", curr_flight, prev_sector, curr_delay);
+				// printf("%s %s %d\n", curr_flight, prev_sector, curr_delay);
+				fprintf(my_data->zero_file, "%s %s %d\n", curr_flight, prev_sector, curr_delay);
 			}
+
+			strcpy(old_sector, prev_sector);
+			strcpy(prev_sector, curr_sector);
+			curr_delay = 1;
+		}
+		else
+		{ /* Same sector as before. */
+			// printf("Incrementing curr_delay.\n");
+			curr_delay++;
 		}
+		//}
 	}
 	//if( globals->dw_verbosity >= OUTPUT_NORMAL )
 		//printf("leaving print_zeros...\n");