From e3368317dd3b2e1ea393c2a0b9ef6ffbb7e48731 Mon Sep 17 00:00:00 2001 From: your github username Date: Sun, 21 Jun 2020 10:35:22 +0530 Subject: [PATCH] Lab commit --- .classpath | 30 ++++++------- build/classes/.gitignore | 3 -- .../PersonalityViewController.class | Bin 0 -> 2403 bytes .../service/PersonalityCalculator.class | Bin 0 -> 1275 bytes .../testing/TestPersonalityCalculator.class | Bin 0 -> 1329 bytes src/controller/PersonalityViewController.java | 11 +++-- src/service/PersonalityCalculator.java | 41 ++++++++++++++++++ src/testing/TestPersonalityCalculator.java | 3 +- 8 files changed, 63 insertions(+), 25 deletions(-) delete mode 100644 build/classes/.gitignore create mode 100644 build/classes/controller/PersonalityViewController.class create mode 100644 build/classes/service/PersonalityCalculator.class create mode 100644 build/classes/testing/TestPersonalityCalculator.class 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 0000000000000000000000000000000000000000..2107183f7375c3a0eb2fb1eef8a1b0392ccb0422 GIT binary patch literal 2403 zcma)8TUQfT6#foLn2-!!qPC3%M5}@zjCZS8FI-eA0tLaUZS6^Ngu%&7oH_Bb+Q<4M z`V0EpKH#EVtB-x?e`;61xj>VN+OigN&YZo^-rxTAW%B3Wzy1#399#ok0!OQ!t9{RL zly5C6Kk!`X*!tC~tzJy+NDO2J1~%k#`O*rM|J+g9TGzT^-R5ICJ`mVLku9B7TCqKM zWp-LXd@j&SJAsz2UX@N$<>)*769U~=Y}eLT1v0}YRt2(CUQHE{!7dX86a{wA*{+&z z)+@@tCo7H;D9w3QI*@e3_vA3E*X=;y_}u@AWI`ZU^KL0EurxgP{)m>;v!)94#DA&< z4MwOY!XOGWFRQAd8Gm5l!w%9Cu6C3Rlm+&MFf7}%W*2q@J@^>?2KvZqBz2^_W-Y%8 zw5ppJz#)?6H5tT#2wZr1(YIZ_tbHZx6L}maeKW3RLfo~%nm4$nbOE2>n1Q1$4qNV+ zIF2C!qY;{MTw0Flv0~3UG{guC5IA9C1fv3bX*3BaEEV;Vcm{`0r08nbAha=oBi8+y z$+6k_o7QvISztBV3vYZQXcS@Lw1HCseeGFlw`bxE&I;@&lq6l#cF>Tzx~_bI^KXkG zg|Fk2`APu1NQsPUXD@1%a<)kA!l86V+CK1~^ap0}dR!s#?d@lys_1M{3V6U>3Xb zxXY~6RS?KE6(U?Pv4}6|Hc_v%hS?t4pY8>Fco9hSE42?ab@hsQ=UvRKAxQQbp zn;0&g+`@Pl=Ep|4IhVn|PD-&dF%8h%A@pG|ayF8j$IfUDmoX6m=*Ja&Mu+>+gR8g} zxx4;0C}NtjZbErITDq}?Df%a-F+%zcvk%_j&gJZAX|9~z!h8nh>>qes&X$%oaqma; zMW7!>pfBgjxdir4xI&e$T2#L2R4GSyzfB9mkTVE*os0rJPWZ#zji8K^{9cXo?G#7+ zX@+zLx0#eX{N=L30bRibJjF%0xP)T@I7x=>9-6A zcTpp$*Am)tl*9z)Xmxw1Xt5WWzi`LE69cnH4v^_}9(KXT2G?E8!BhS_k01in{{bP6 BeH;J) literal 0 HcmV?d00001 diff --git a/build/classes/service/PersonalityCalculator.class b/build/classes/service/PersonalityCalculator.class new file mode 100644 index 0000000000000000000000000000000000000000..266ce0761245301f111bebbedc385b8b30ffc1f4 GIT binary patch literal 1275 zcmaJ>-A)rh7(LV7c1wTgwxyue0*WZm()tT31O*dglcGiliQ$HAJHSHS*6rfYm5K2I zO!Ng%6L0ZGi7`BYZ{rJ~XSO70AYROwZ@zx>%{gag`*Z*M9)PQuG7u2RwWa&auF29v z>9(7W)v&#ncdSNjt6_Of*MKfyZdlK(Qp0lAN)M_VvgQedrftXeW(2g6(Io->PO~l} z(9jh_5Fvp?#dhTVttVCKE?U)w6i8K?HLI~?xwcv#Bz14yZVL=l{!3y?Ah~Kg^~cRE zch0qJXYpl=9nX(c4v8&zuI;Q%jUG)!!0j=lkQRulHnUFqIkgJ(9@k*G97aYUR*|dT zcvYPy>tXZ>r0+KeYYl0+gDqFCN>@5H8OBM0_#=C5{jb_n0%C|3wS7uT`4O4|VasWk zow7qO1IuOZnB`FO9LEbbUGS{h=DgMNoicF#pKIu-H82pyDC-Lm3?m;y0pkL}c8hl? zaN$^WN4Z2$!X*P2>Cz!j5|eAvjo~t`kZj9x+tMeSIj$>t8_kwyHyyef_Rpuuv~2n4 zainV-m=K68@H%VquB~22_Sn}~RD^Jb7pU>Yf=GD?5e=?NoCW9L*f)f~FbE(*R6hec zqQqFIfODKHfo>#-+$`>~S%|sM`CXXv1+7@niz|g7M~K7VFn#D!QA9yhL0mynLAtmy z!`ebvEz};$XAS2@_Rob^V-a3Bnr8F?(!~*58h}Zm*3m|{i|@ODeLn)#fv#j zjyWpnN0##tIjL(L>onzmR*ox!zg{CZexx{gz`vVnCw=~kYaD@nBn@0wG@~rM!DIk8 F{{XK{0)YSk literal 0 HcmV?d00001 diff --git a/build/classes/testing/TestPersonalityCalculator.class b/build/classes/testing/TestPersonalityCalculator.class new file mode 100644 index 0000000000000000000000000000000000000000..53ea6e58e9579c5bae14d163bf45853a97b6c96a GIT binary patch literal 1329 zcmah}?NSp<5IvJbb_t8Y#V%yu$AT zl{Di>hJk*yBtyRyN*yN_asmT8@`Wsik_Ydv?J#0lfc&6$> zGhl*+D2lbzK^!sufEOoQ<((EurZueE7!sJ6EzOnY`OcOqrAz7Fd@HGLKGhj(#m2CJ zlLTAadfjAI8;0(PgHsq4IJEgIB7yUh-hMA?I$`gs#eb^uIE`@&X9#c~-$Ij>)(+0% z9J9()y8XN*L-LsDj@#~WwJU5#Q>@#V;NdozIZ{e#a5dx%(LIXk-bPWNFI1a*>}*W` zQk*&Zw4XiC3gu35F0cks?1xGwjYMs#L`A-`Q5Fz0dCX$o!rV{8*)E8~@xCNr`*EaM zRI(fHX1BC0lbU+oGQq0FM|oVqRSSOz4DMI<_Df$iOp6^{gUz99u+qAwrT=s#kv@mc zic>p-yIpnabc6tTxeCj`M;za|GedS%^4HkTP zAGl_?=Uw93OKFi-V;h+Ifc(@aIBOqp@I4A|)02m|9!&jvkwYE@`nc3NZ66HcFeO4~ zybO+V-$Usbzb5uqdYar%+~b~mV(J|V)4MqN7slN4o;%qsPkC;sOP+Qw?qcROoITy@ zv`7_)e<}McK@D}bB@2W18WFcq7cjtQklHb#9_Ma`NUsv-A~D{@arzC> z^8{8gjK>&BxsA0kcerJ-hAOTz%PK4ICvK4EO~&s>_M7=B&ekkk$ Az5oCK literal 0 HcmV?d00001 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