Issue WIth Emotion Not Updating GetResponse Solved - Refactoring

Author: spydaz

AI_AgentModel.vb

@@ -2,8 +2,8 @@
 Imports AI_Contracts
 Public Class AI_AgentModel
     'ShortTerm Memory
-    Private PreviousResponses As List(Of String)
-    Private PreviousUserInputs As List(Of String)
+    Private PreviousResponses As New List(Of String)
+    Private PreviousUserInputs As New List(Of String)
 
     'Working Memory 
     Public PreviousResponse As String
@@ -27,7 +27,10 @@ Public Class AI_AgentModel
         'IF NO RESPONSE TRY -  Question Answer Database
         If GET_RESPONSE = "" Then GetQAResponse(UserInput, GET_RESPONSE)
         'TRY EMOTIONAL RESPONSE
-        If GET_RESPONSE = "" And Sentiment.NewEmotionDetected(UserInput) = True Then Sentiment.MakeEmotionalResponse()
+        If GET_RESPONSE = "" And Sentiment.NewEmotionDetected(UCase(UserInput)) = True Then
+            GET_RESPONSE = Sentiment.MakeEmotionalResponse()
+        End If
+
         'IF No Response Fallback Response
         If GET_RESPONSE = "" Then GET_RESPONSE = "Excuse me? Please, Rephrase?"
 

Emotion_Handler.vb

@@ -70,30 +70,42 @@
                 MakeEmotionalResponse = "" & LCase(FoundEmotion) & " "
         End Select
     End Function
-    Private Sub SetEmotionState(ByRef UserInput As String)
+
+    Private Sub ResetStateCounters()
         'Reset Counters
         StateChanged = False
         DetectedState = EmotionType.Neutral
         StateDetected = False
+    End Sub
+    Private Sub SetCurrentQuotient()
+        'Check if neutral - Then reduce current Quotient
+        If Handler.DetectedEmotion = EmotionType.Neutral Then
+            CurrentQuotient -= 1
+            If CurrentQuotient = 0 Then
+                CurrentState = EmotionType.Neutral
+            Else
+            End If
+        End If
+    End Sub
+
+    Private Handler As New EmotionHandler
+
+    Private Sub SetEmotionState(ByRef UserInput As String)
+        ResetStateCounters()
 
         'Start - Emotion Test
-        Dim Handler As New EmotionHandler
         If Handler.DetectEmotion(UserInput) = True Then
-            'Check if neutral - Then reduce current Quotient
-            If Handler.DetectedEmotion = EmotionType.Neutral Then
-                CurrentQuotient -= 1
-                If CurrentQuotient = 0 Then
-                    CurrentState = EmotionType.Neutral
-                Else
-                End If
-            End If
+
+            SetCurrentQuotient()
 
             'Get State
             DetectedState = Handler.DetectedEmotion
             StateDetected = True
             'IF State is the same Increase Intensity
             If DetectedState = CurrentState Then
                 CurrentQuotient += 1
+                CurrentStateStr = Handler.DetectedEmotionStr
+                CurrentState = DetectedState
             Else
                 'IF State is the differnt then change
                 CurrentStateStr = Handler.DetectedEmotionStr