From dcf80572695d075e169e82a08f5b7a84f789f3d0 Mon Sep 17 00:00:00 2001
From: Orange_Dugongo <raffy.m.96@gmail.com>
Date: Fri, 21 Oct 2016 13:19:12 +0200
Subject: [PATCH] Fix 12 am/pm

---
 src/Time/Test.class | Bin 869 -> 868 bytes
 src/Time/Test.java  |   2 +-
 src/Time/Time.class | Bin 1995 -> 2181 bytes
 src/Time/Time.java  |  27 ++++++++++++++++-----------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/Time/Test.class b/src/Time/Test.class
index fef20e31160cc6cabecca750b7f3baed2f85e9d7..15bbe199bd2cc60a07971d5b026b41c766db69bc 100644
GIT binary patch
delta 75
zcmaFL_JnQ2P9}i`46F<+3=9mxyBU}w1-O|fpJIyD;$>iCkYr$IP+{O?Fks+fFlXRq
cuxH?5@M7R&2x8y|$}s>*rhg1xlLMJW028<iv;Y7A

delta 76
zcmaFD_LObIPA0*H46F<+3=9k*yBU}w1$YFECZA-A)#77dV~}ECXHaF}WH4mlVz6M~
fW^iEOVen?)V+dy8XOINy;Add^$KX9VfLR0pC)*4D

diff --git a/src/Time/Test.java b/src/Time/Test.java
index ccd22b1..40f6c6a 100644
--- a/src/Time/Test.java
+++ b/src/Time/Test.java
@@ -2,7 +2,7 @@ import java.util.Scanner;
 
 public class Test{
     public static void main(String [] args){
-        Time t = new Time(12, 50, "am");
+        Time t = new Time(11, 00, "am");
         Time t2 = new Time(1, 1, "pm");
         Scanner sc = new Scanner(System.in);
 
diff --git a/src/Time/Time.class b/src/Time/Time.class
index f567d213e4b37f05ca143bb1a4d9ac28a28545bb..6156d7536328d943d85f4f85d05843059c074bd7 100644
GIT binary patch
literal 2181
zcmaJ?Yf}?v6n@^^HiYF80s<z8P{d>@P!z2cuw3dT3W$Oz*eVNI$l4^NA#~cGf}fmD
zXZYd=J0oGHcKQSQn>w97XLk_@$cLQw_MGc;&gP&0{`?!jFg7A+$9N4Ia9hN;A|^CU
zMi9ifh^a89W&KXXoe1vYUIh1%7V$vDLk%+#YR!f*7r`UUhw)g>Ped$;SQPP8#FB<*
z3O+ld&@}Vf{Mj7LnT5^4g>uO*Y>q0ZEPrYK@(Q6byI_}ZE3_ul>C@oUl0sm5D`P1%
z%-98MZYRHHl@`sl9B+b~Ryj>4&B@ehP3rOazJfoQqAxkjQf1p!X-S^eaD4HdI)P;R
z@FYq_23}TZ^OWqZ!Fjo1LYA2yb&%XKlDLQ1DciZhg>|z~uu7w;nMFHqG4HyCvbp}_
ztXcHp58K<bb|z!~>IAu>5OFRF_GXse!sV@5yRcJcqME%uxly)C3N=aBSc+(>PgxsV
zC8@-A*505_kVTYmA`4qPrFHABEoG_^_XEO%j!rz+kwAxzOCl~J&dOI)G__;rGFC~)
zGU!HKmdy(t-=jyv4?12VrQwy1Rb1C$qF2WndRQ}YBOWf3`(j?hx{eI!-)H7^TodrH
zh#R7D6JP5XL7zh7k@rVyudQ`vLB^Ov$SfAE0*jg;8K>CtVq{hO&!X}iJnQOqqC(8^
zeUeUA+o3yGP>4G3$I0Yt*4&=6eqoqeflFE%BOtpIsT_I;SwHQVxow3L4d*60np!~@
z$EBSk>W5Fr;La!XI4c?A+6W~zrR?HqjPC)i&Bg(g5#NW;NbJLJ^zS3^2k#ZSDKBt{
zfe?`zY7j;}WegF%et{m(QU_N>RM7Z<!23_CA?LD=@(Ow>#p!XV?_Cu%O3>9aq5f)U
z3!zD*JgePI#YbZyqwhrU5$Cp@DO@DdK;J36q<xgEi|-)*5|Lk?jrUjMyNK^5z8?dg
z{Ra*Sz(C(e1eXsO*9Z72(3-*()Nt=Vwh!>Cf=C6m)poDYVlT@*h_5`m1$q+7hKvgI
zUG#CO8*}%avLAQ%F)sCUAJMQJPxK$4@x2mKd=8)8<Pc0uV|qFr#29oNU3Ah(4~DqA
zK`C9N2C2eX^L*dtNl1=ME{*zI#DwjpXa!BX&;ol1I3&4VT<S+0OF{VBCpfw?vgg~1
zonveKxGg1<@7XdXRK|7lSU3^3bn`A`Y1u`+vFwDrDlIO%u`Cz=YBcz^D1GIITu(c|
zBs*n_{W|Tr^T$Hc>-@%e?uH4MR*SO67y9`7?K8>WI}EsCLZ;)^CksQKg?fYPt#3Y~
z{_s#;chvcP^8)ybaZ04N1Q3@TR>zG*<5*E<mus%Ejaw(tH;nQq^*!8jvL|)A(G=yN
z?4j4a`5mq9jR()rz#cobDdvrnTcT_181N6f7W3?z#~hL;EY$*OUF6r~Dehnib9lzn
zbAHEHki`opiy8#}#dQ@;1ewDKzVR}->Sa=E#7RkFwSu<l5qQZj%`3u3>DPy`{{g+6
BWcmOA

literal 1995
zcmbVN$x<6v6g}M<T9O-(#Ar*{1`m;10h!p2V@qI$1Q2F$ER2IQ6b&@cj%XAOsqC}K
zFF31IDplTO;Zzw>6<6g0@=d8!&h2h6Q?kgS@4N54bH{U^^ylBd{{i3*zKWp-_oC>)
zM<VWvc%Y#WLkRao6eAdwbxg#=7{)OX!z89ed@SM<4bw4N%|tL8LkV-Tc_d;!f&~qW
z3RHVjL2~|u`K_6+n9g>-+^E^kc0qx%!>`0|S3$UFJ9cACL2ss1It$LOC<spNZCVOC
z=55DXZ0@dGwPka?!jsUp)hIDYS0;Pbl6JhFRS?Kz8A~<`G^u+g-I=o%ZY<u@CYUK5
z?!>6d#2X6wd?R}=|5#2~kY(-`TqHGSlJXJFhF!^*H%!N|YK83lvb}4u?zVEn-1vII
ztor#!8hZ=2(`>L5&8|;uHLRL~XvTwQpDT#i^+{`MuO_wDckC_Z5MrAoV642?tZi7+
zwlpFt0fwd1I?`CuaS@kvq(t<hkG(xj!erB~Y+5xPkMSvaxGKsM9c2t?Sl00rH#My2
zc!tk(tm2xE=NMpDB#cDpC%e^M4WH}y0$=LL3*;6?cx;l>_`7gR>o2SgrcDx<bl9v`
zEr)$dv%hBu@RMSrhR$Q>Kk#g%H(Uxj-Pk7?VtZW%D~^JMdw-lC-tL(7Me92+O}1Tg
zxG4$aLD5bWbQmXWebY26bp<CT$t$;zWxMzkdidA^P=y0(s<7g&B!+7{*a!4eUgoaI
z`ykgY;{b}0+J|bS_Yp9L_7VJz=L)V+_V76ZVInm|5uuMLIuYaTRYvqYiARN~knsk=
z*GHyd_pps}5Z5Rr=y9m}>nUi0pzG&C1E-<ggx<hS-|HYtQRysf<W3|Xb5Ad_giA!e
zhs+tgl>M$)58qGxWg@fZ;{&Jh1H=y!Zy@LUpL0n7hI4NbT0LN1Z=klIB_l0FsRxef
zK_0abYvICazc(<%3Zr<RtJgh;k%Y1lqXqpXa$MSqo_<C2QBUvW(!Tf>9jmGI&;jDF
z6(L1+`5YvNV4@n`>U7+RVa`gPcemL45o&jNB2%Q~8I|wMkG&vAytpnTClf6sU!vVu
zWnpoBO@>Fb;*M0eCTw}(+Gz#cXQ&4p%EF=RUb^Dz^<Cc~Sm;YI@6H^*pP>a`A?UL1
z`SE7yp=%$4+A%H@_rZ~e5#K|*LG!L3|HXXj&|G)TZy)jdJ+qWNCnbSYBJ@*rZPZA|
zi&c3KTr2TDs$PluFX%Or3C@{c{3dT+k=A6lKYPa;J%bCFWs^&ss5wsHBer~=eOSZ<
zmfUnSsDGiLgjmmQ{!w~F|3I3B=ov{Uonl|t+^oioem^U&|39lIi1U}X56fitDF<PN
at$fD6+*M5TcUS0lvl@4^y34JK5B~v<s!KBf

diff --git a/src/Time/Time.java b/src/Time/Time.java
index 9360b37..52c5812 100644
--- a/src/Time/Time.java
+++ b/src/Time/Time.java
@@ -53,10 +53,18 @@ public class Time{
         return null;
     }
 
+    private boolean isMidday(){
+        return h==12 && id.equals("pm");
+    }
+
+    private boolean isMidnight(){
+        return h==12 && id.equals("am");
+    }
+
     public int toMinute(){
-        if(id.equals("pm"))
+        if((id.equals("pm") && !isMidday()) || isMidnight())
             h+=12;
-        return h*60+m;
+        return (h*60+m)%(24*60);
     }
 
     public boolean isAfter(Time t){
@@ -71,7 +79,11 @@ public class Time{
         int totm=this.toMinute() + m%(24*60);
         this.m=totm%60;
         this.h=(totm/60)%24;
-        if(this.h>12){
+        if(this.h==0){
+            this.h+=12;
+        }else if(this.h==12){
+            this.id="pm";
+        }else if(this.h>12){
             this.id="pm";
             this.h-=12;
         }else
@@ -79,14 +91,7 @@ public class Time{
     }
 
     public void shift(int h, int m){
-        int totm=this.toMinute() + (m+h*60)%(24*60);
-        this.m=totm%60;
-        this.h=(totm/60)%24;
-        if(this.h>12){
-            this.id="pm";
-            this.h-=12;
-        }else
-            this.id="am";
+        shift(h*60+m);
     }