queueing functionality fixed

dahlbyk-demo · Sep 10, 2020 · 096b71f · 096b71f
1 parent f77aa71
commit 096b71f
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 38 deletions.
diff --git a/Assets/AnimalShelter1.PNG b/Assets/AnimalShelter1.PNG
diff --git a/Assets/AnimalShelter2.PNG b/Assets/AnimalShelter2.PNG
diff --git a/DataStructures.Tests/AnimalTests.cs b/DataStructures.Tests/AnimalTests.cs
@@ -3,8 +3,6 @@
 using Xunit;
 using DataStructures.StacksAndQueues;
 
-
-
 namespace DataStructures.Tests
 {
     public class AnimalTests
@@ -13,7 +11,7 @@ public class AnimalTests
         public void Shelter_starts_empty()
         {
             // Arrange
-            AnimalShelter<object> shelter = new AnimalShelter<object>();
+            AnimalShelter shelter = new AnimalShelter();
 
             // Act
             bool result = shelter.ShelterIsEmpty();
@@ -26,7 +24,7 @@ public void Shelter_starts_empty()
         public void Shelter_can_add_animals()
         {
             // Arrange
-            AnimalShelter<object> shelter = new AnimalShelter<object>();
+            AnimalShelter shelter = new AnimalShelter();
 
             // Act
             shelter.AnimalEnqueue(Animal.Type.Dog);
@@ -40,34 +38,33 @@ public void Shelter_can_add_animals()
         public void Dequeue_returns_dog()
         {
             // Arrange
-            AnimalShelter<object> shelter = new AnimalShelter<object>();
+            AnimalShelter shelter = new AnimalShelter();
+            shelter.AnimalEnqueue(Animal.Type.Bird);
             shelter.AnimalEnqueue(Animal.Type.Dog);
             shelter.AnimalEnqueue(Animal.Type.Cat);
 
             // Act
-            AnimalShelter<object>.Node result = shelter.AnimalDequeue(Animal.Type.Dog);
+            Animal.Type? result = shelter.AnimalDequeue(Animal.Type.Dog);
 
             // Assert
-            Assert.Equal(Animal.Type.Dog, result.Value);
+            Assert.Equal(Animal.Type.Dog, result);
         }
 
         [Fact]
         public void Dequeue_returns_dog_or_cat_or_null()
         {
             // Arrange
-            AnimalShelter<object> shelter = new AnimalShelter<object>();
+            AnimalShelter shelter = new AnimalShelter();
             shelter.AnimalEnqueue(Animal.Type.Bird);
             shelter.AnimalEnqueue(Animal.Type.Dog);
             shelter.AnimalEnqueue(Animal.Type.Cat);
 
             // Act
-            AnimalShelter<object>.Node result = shelter.AnimalDequeue(Animal.Type.Bird);
+            Animal.Type? result = shelter.AnimalDequeue(Animal.Type.Bird);
 
             // Assert
-            Assert.Null(result);
+            Assert.Null(result); 
         }
 
-
-
     }
 }
diff --git a/DataStructures/StacksAndQueues/AnimalShelter.cs b/DataStructures/StacksAndQueues/AnimalShelter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using System.Transactions;
 using DataStructures.StacksAndQueues;
 
 namespace DataStructures.StacksAndQueues
@@ -13,51 +14,63 @@ public enum Type {
         }
     }
 
-    public class AnimalShelter<T>
+    public class AnimalShelter
     {
         public class Node
         {
-            public Node(T value)
+            public Node(Animal.Type value)
             {
                 Value = value;
             }
             // Value of this node
-            public T Value { get; set; }
+            public Animal.Type Value { get; set; }
             // Pointer to the next node in the list
             public Node Next { get; set; }
 
             public Node Prev { get; set; }
         }
+
         public Node Front { get; set; }
         public Node Rear { get; set; }
 
 
-        public void AnimalEnqueue(T animal)
+        public void AnimalEnqueue(Animal.Type animal)
         {
             Node node = new Node(animal);
-            if (Front == null)
+            if (Rear == null)
             {
-                node.Next = node;
-                Front = node;
-            }
+                Front = Rear = node;
 
+            }
             else
             {
-                node.Next = node;
+                Node prev = Rear;
                 Rear = node;
+                prev.Next = node;
+                node.Prev = prev;
             }
         }
 
-        public Node AnimalDequeue(Animal.Type pref)
+        public Animal.Type? AnimalDequeue(Animal.Type pref)
         {
-            if (pref == Animal.Type.Dog || pref == Animal.Type.Dog)
+            var current = Front;
+            if (pref == Animal.Type.Dog || pref == Animal.Type.Cat)
             {
-                Node temp = Front;
-                Front = Front.Next;
-                temp.Next = null;
-                return temp;
+                while (current != null)
+                {
+                    if(current.Value == pref)
+                    {
+                        Node temp = current;
+                        current.Prev.Next = temp.Next;
+                        current.Next.Prev = temp.Prev;
+                        return current.Value;
+                    }
+                    current = current.Next;
+                    if (current == Rear)
+                        break;
+                }
+                return null;
             }
-
             else return null;
         }
 
@@ -70,9 +83,5 @@ public bool ShelterIsEmpty()
             else
                 return false;
         }
-
-
-
-
     }
 }
diff --git a/DataStructures/StacksAndQueues/Queueing.cs b/DataStructures/StacksAndQueues/Queueing.cs
@@ -24,15 +24,18 @@ public Node(T value)
         public void Enqueue(T value)
         {
             Node node = new Node(value);
-            if (Front == null)
+            if (Rear == null)
             {
-                node.Next = node;
-                Front = node;
+                Front = Rear = node;
+
             }
+
             else
             {
-                node.Next = node;
+                Node prev = Rear;
                 Rear = node;
+                prev.Next = node;
+                node.Prev = prev;
             }
         }
 

diff --git a/DataStructures/StacksAndQueues/Stacking.cs b/DataStructures/StacksAndQueues/Stacking.cs
@@ -3,8 +3,7 @@ namespace DataStructures.StacksAndQueues
 {
     public class Stack<T>
     {
-        internal AnimalShelter<T>.Node Front;
-
+
         public class Node
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,7 @@ namespace DataStructures.StacksAndQueues @@
     {
         public class Stack<T>
         {
-            internal AnimalShelter<T>.Node Front;
             public class Node
             {
@@ Expand Down @@