From b4205b7b7f841a70a08411ba1b93f14a99186489 Mon Sep 17 00:00:00 2001
From: Omar Sahl <omar753sahl@gmail.com>
Date: Mon, 18 Dec 2017 17:59:19 +0200
Subject: [PATCH] solved some conflicts between branches

---
 src/main/java/models/PerformanceMetrics.java | 4 +++-
 src/main/java/models/QueueModel.java         | 2 +-
 src/main/java/models/QueueType.java          | 2 +-
 src/main/java/ui/InputScreenController.java  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/models/PerformanceMetrics.java b/src/main/java/models/PerformanceMetrics.java
index 57093e4..b714b7b 100644
--- a/src/main/java/models/PerformanceMetrics.java
+++ b/src/main/java/models/PerformanceMetrics.java
@@ -9,7 +9,9 @@ public class PerformanceMetrics {
     private double W;
     private double Wq;
 
-    public PerformanceMetrics(){};
+    public PerformanceMetrics() {
+    }
+
     public PerformanceMetrics(double l, double lq, double w, double wq) {
         L = l;
         Lq = lq;
diff --git a/src/main/java/models/QueueModel.java b/src/main/java/models/QueueModel.java
index d2714f1..3122917 100644
--- a/src/main/java/models/QueueModel.java
+++ b/src/main/java/models/QueueModel.java
@@ -8,7 +8,7 @@
 public abstract class QueueModel {
 
     /**
-     * Calls {@link #calculatePerformanceMetrics(double, double)} asynchronously by returning an {@link Observable}
+     * Calls {@link #calculatePerformanceMetrics(QueueSystemInput)} asynchronously by returning an {@link Observable}
      * which can be observed on a background thread.
      *
      * @param input: the Queue System Input Variables
diff --git a/src/main/java/models/QueueType.java b/src/main/java/models/QueueType.java
index 6107583..6cc2bfe 100644
--- a/src/main/java/models/QueueType.java
+++ b/src/main/java/models/QueueType.java
@@ -5,5 +5,5 @@
  * Date: 17-Dec-17.
  */
 public enum QueueType {
-    DD1K, MM1, MMCK;
+    DD1K, MM1, MM1K, MMC, MMCK;
 }
diff --git a/src/main/java/ui/InputScreenController.java b/src/main/java/ui/InputScreenController.java
index 5d38e1a..d8eaf68 100644
--- a/src/main/java/ui/InputScreenController.java
+++ b/src/main/java/ui/InputScreenController.java
@@ -54,7 +54,7 @@ public void initView(QueueType queueName) {
                 showSystemCapacity = false;
                 showNumberOfServers = true;
                 break;
-            case MMK:
+            case MM1K:
                 showSystemCapacity = true;
                 showNumberOfServers = false;
                 break;