diff --git a/.classpath b/.classpath
index 2846539..ea8b998 100644
--- a/.classpath
+++ b/.classpath
@@ -1,17 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
deleted file mode 100644
index 611b17f..0000000
--- a/build/classes/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/service/
-/controller/
-/testing/
diff --git a/build/classes/controller/PersonalityViewController.class b/build/classes/controller/PersonalityViewController.class
new file mode 100644
index 0000000..2107183
Binary files /dev/null and b/build/classes/controller/PersonalityViewController.class differ
diff --git a/build/classes/service/PersonalityCalculator.class b/build/classes/service/PersonalityCalculator.class
new file mode 100644
index 0000000..266ce07
Binary files /dev/null and b/build/classes/service/PersonalityCalculator.class differ
diff --git a/build/classes/testing/TestPersonalityCalculator.class b/build/classes/testing/TestPersonalityCalculator.class
new file mode 100644
index 0000000..53ea6e5
Binary files /dev/null and b/build/classes/testing/TestPersonalityCalculator.class differ
diff --git a/src/controller/PersonalityViewController.java b/src/controller/PersonalityViewController.java
index bbf6331..5d259f5 100644
--- a/src/controller/PersonalityViewController.java
+++ b/src/controller/PersonalityViewController.java
@@ -9,12 +9,17 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import service.PersonalityCalculator;
+
@WebServlet(urlPatterns= {"/personality"})
public class PersonalityViewController extends HttpServlet {
private static final long serialVersionUID = 1L;
-
+ //Progression 4
+
+// pc.findYourBrainType(options);
+
public PersonalityViewController() {
super();
@@ -34,7 +39,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
System.out.println(options);
- /*
+ PersonalityCalculator message = new PersonalityCalculator();
request.setAttribute("message", message);
@@ -53,7 +58,7 @@ else if(message.equals("leftbrained")) {
rd.forward(request, response);
}
- }*/
+ }
}
}
diff --git a/src/service/PersonalityCalculator.java b/src/service/PersonalityCalculator.java
index da9ce41..70658cf 100644
--- a/src/service/PersonalityCalculator.java
+++ b/src/service/PersonalityCalculator.java
@@ -1,2 +1,43 @@
package service;
+//Progression 1
+public class PersonalityCalculator{
+
+// //Progression 2
+ public String findYourBrainType(String string) {
+// //String options = "5,2,3,1,4,3,2,1,5,4,3,2,1,5,4,3,2,1,2,2";
+// //Split function delimiter - ','
+//
+ int ansInInt[]=findAnswers(string);
+ int A = ansInInt[0]+ansInInt[1]+ansInInt[2]+ansInInt[3]+ansInInt[4]+ansInInt[7]+ansInInt[9]+ansInInt[10]+ansInInt[11]+ansInInt[13]+ansInInt[17]+ansInInt[19];
+ int B = ansInInt[3]+ansInInt[5]+ansInInt[6]+ansInInt[8]+ansInInt[12]+ansInInt[14]+ansInInt[15]+ansInInt[16]+ansInInt[18];
+ int x = 66 - A - B;
+// return options;
+ if(x>=20 && x<=55)
+ return "Left-brained";
+ else if (x >= 56 && x<=64)
+ return "No clear preference";
+ else if (x>=65 && x<=100)
+ return "Right-brained";
+ else
+ return "#";
+ }
+// //Progression 3
+ public static int[] findAnswers(String options) {
+ String splitAns[] = options.split(",");
+ int[] ansInInt = new int[splitAns.length];
+ for(int i =0; i< splitAns.length;i++) {
+ ansInInt[i] = Integer.parseInt(splitAns[i]);
+ }
+ return ansInInt;
+ }
+
+}
+
+
+
+/*Range Results:
+20-55 Left-brained
+56-64 No clear preference
+65-100 Right-brained
+*/
\ No newline at end of file
diff --git a/src/testing/TestPersonalityCalculator.java b/src/testing/TestPersonalityCalculator.java
index 653c596..eb1873f 100644
--- a/src/testing/TestPersonalityCalculator.java
+++ b/src/testing/TestPersonalityCalculator.java
@@ -1,5 +1,4 @@
package testing;
-/* Uncomment the below code to test your application
import static org.junit.Assert.assertEquals;
@@ -28,4 +27,4 @@ public void testFindYourBrainTypeMethod() {
e.printStackTrace();
}
}
-}*/
\ No newline at end of file
+}
\ No newline at end of file