From 4b9d7f8494332bd2162bc27ad03c52edca5107ac Mon Sep 17 00:00:00 2001 From: eugenefischer <66030419+eugenefischer@users.noreply.github.com> Date: Sat, 22 Oct 2022 14:59:24 -0500 Subject: [PATCH] Add option to select matching algorithm type, rename types in output --- src/main/java/InteractiveInterface.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/InteractiveInterface.java b/src/main/java/InteractiveInterface.java index d401a3c..5de58ff 100644 --- a/src/main/java/InteractiveInterface.java +++ b/src/main/java/InteractiveInterface.java @@ -583,8 +583,9 @@ public class InteractiveInterface { while(!backToOptions) { System.out.println("\n---------ALGORITHM OPTIONS----------"); System.out.println("1) Use scaling algorithm by Duan and Su."); - System.out.println("2) Use LEDA book algorithm with Fibonacci heap priority queue"); - System.out.println("3) Use LEDA book algorithm with pairing heap priority queue"); + System.out.println("2) Use Hungarian algorithm with Fibonacci heap priority queue"); + System.out.println("3) Use Hungarian algorithm with pairing heap priority queue"); + System.out.println("4) Use auction algorithm"); System.out.println("0) Return to Options menu"); try { input = sc.nextInt(); @@ -592,14 +593,18 @@ public class InteractiveInterface { case 1 -> System.out.println("This option is not yet implemented. Choose another."); case 2 -> { BiGpairSEQ.setFibonacciHeap(); - System.out.println("MWM algorithm set to LEDA with Fibonacci heap"); + System.out.println("MWM algorithm set to Hungarian with Fibonacci heap"); backToOptions = true; } case 3 -> { BiGpairSEQ.setPairingHeap(); - System.out.println("MWM algorithm set to LEDA with pairing heap"); + System.out.println("MWM algorithm set to Hungarian with pairing heap"); backToOptions = true; } + case 4 -> { + BiGpairSEQ.setAuctionAlgorithm(); + System.out.println("MWM algorithm set to auction"); + } case 0 -> backToOptions = true; default -> System.out.println("Invalid input"); }