From d97f6da7d38eb76a673ae39b1d39679524347dc9 Mon Sep 17 00:00:00 2001 From: smiranda <smiranda@student.unimelb.edu.au> Date: Wed, 21 Apr 2021 15:01:59 +1000 Subject: [PATCH] final-version-1.1: floor service record implemented, debugging prints removed. --- .idea/libraries/WifiModem.xml | 9 +++ .idea/libraries/WifiModem__2_.xml | 9 +++ .idea/misc.xml | 6 ++ .idea/modules.xml | 8 +++ .idea/swen30006-group-work.iml | 12 ++++ .idea/workspace.xml | 64 ++++++++++++++++++ Automail/automail.properties | 3 +- .../automail/Automail.class | Bin 0 -> 1187 bytes .../automail/ChargeCalculator.class | Bin 0 -> 2175 bytes .../automail/MailItem.class | Bin 0 -> 3504 bytes .../automail/MailPool$Item.class | Bin 0 -> 695 bytes .../automail/MailPool$ItemComparator.class | Bin 0 -> 1062 bytes .../automail/MailPool.class | Bin 0 -> 5181 bytes .../automail/Robot$1.class | Bin 0 -> 746 bytes .../automail/Robot$RobotState.class | Bin 0 -> 1156 bytes .../swen30006-group-work/automail/Robot.class | Bin 0 -> 4835 bytes .../automail/RobotDevice.class | Bin 0 -> 1065 bytes .../automail/StatisticsLog.class | Bin 0 -> 1677 bytes .../ExcessiveDeliveryException.class | Bin 0 -> 422 bytes .../exceptions/ItemTooHeavyException.class | Bin 0 -> 382 bytes .../MailAlreadyDeliveredException.class | Bin 0 -> 410 bytes .../simulation/Building.class | Bin 0 -> 380 bytes .../simulation/Clock.class | Bin 0 -> 482 bytes .../simulation/IMailDelivery.class | Bin 0 -> 161 bytes .../simulation/MailGenerator.class | Bin 0 -> 3847 bytes .../Simulation$ReportDelivery.class | Bin 0 -> 1615 bytes .../simulation/Simulation.class | Bin 0 -> 7811 bytes Automail/src/automail/Automail.java | 2 - Automail/src/automail/ChargeCalculator.java | 24 +++++-- Automail/src/automail/MailPool.java | 12 ---- Automail/src/automail/RobotDevice.java | 1 - Automail/src/simulation/Simulation.java | 23 +++---- 32 files changed, 137 insertions(+), 36 deletions(-) create mode 100644 .idea/libraries/WifiModem.xml create mode 100644 .idea/libraries/WifiModem__2_.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/swen30006-group-work.iml create mode 100644 .idea/workspace.xml create mode 100644 Automail/out/production/swen30006-group-work/automail/Automail.class create mode 100644 Automail/out/production/swen30006-group-work/automail/ChargeCalculator.class create mode 100644 Automail/out/production/swen30006-group-work/automail/MailItem.class create mode 100644 Automail/out/production/swen30006-group-work/automail/MailPool$Item.class create mode 100644 Automail/out/production/swen30006-group-work/automail/MailPool$ItemComparator.class create mode 100644 Automail/out/production/swen30006-group-work/automail/MailPool.class create mode 100644 Automail/out/production/swen30006-group-work/automail/Robot$1.class create mode 100644 Automail/out/production/swen30006-group-work/automail/Robot$RobotState.class create mode 100644 Automail/out/production/swen30006-group-work/automail/Robot.class create mode 100644 Automail/out/production/swen30006-group-work/automail/RobotDevice.class create mode 100644 Automail/out/production/swen30006-group-work/automail/StatisticsLog.class create mode 100644 Automail/out/production/swen30006-group-work/exceptions/ExcessiveDeliveryException.class create mode 100644 Automail/out/production/swen30006-group-work/exceptions/ItemTooHeavyException.class create mode 100644 Automail/out/production/swen30006-group-work/exceptions/MailAlreadyDeliveredException.class create mode 100644 Automail/out/production/swen30006-group-work/simulation/Building.class create mode 100644 Automail/out/production/swen30006-group-work/simulation/Clock.class create mode 100644 Automail/out/production/swen30006-group-work/simulation/IMailDelivery.class create mode 100644 Automail/out/production/swen30006-group-work/simulation/MailGenerator.class create mode 100644 Automail/out/production/swen30006-group-work/simulation/Simulation$ReportDelivery.class create mode 100644 Automail/out/production/swen30006-group-work/simulation/Simulation.class diff --git a/.idea/libraries/WifiModem.xml b/.idea/libraries/WifiModem.xml new file mode 100644 index 0000000..b2c4e35 --- /dev/null +++ b/.idea/libraries/WifiModem.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="WifiModem"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/Automail/WifiModem.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/WifiModem__2_.xml b/.idea/libraries/WifiModem__2_.xml new file mode 100644 index 0000000..b8caf1b --- /dev/null +++ b/.idea/libraries/WifiModem__2_.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="WifiModem (2)"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/Automail/WifiModem.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..009eed1 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="15" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/Automail/out" /> + </component> +</project> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..36c6e50 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/swen30006-group-work.iml" filepath="$PROJECT_DIR$/.idea/swen30006-group-work.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/.idea/swen30006-group-work.iml b/.idea/swen30006-group-work.iml new file mode 100644 index 0000000..a6aa546 --- /dev/null +++ b/.idea/swen30006-group-work.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/Automail/src" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="WifiModem (2)" level="project" /> + </component> +</module> \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..d4f4346 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ChangeListManager"> + <list default="true" id="f1fdc998-0877-4462-bd63-261035866328" name="Default Changelist" comment="" /> + <option name="SHOW_DIALOG" value="false" /> + <option name="HIGHLIGHT_CONFLICTS" value="true" /> + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> + <option name="LAST_RESOLUTION" value="IGNORE" /> + </component> + <component name="CodeInsightWorkspaceSettings"> + <option name="optimizeImportsOnTheFly" value="true" /> + </component> + <component name="MavenImportPreferences"> + <option name="generalSettings"> + <MavenGeneralSettings> + <option name="mavenHome" value="C:\Program Files\JetBrains\IntelliJ IDEA Community Edition 2020.2.3\plugins\maven\lib\maven3" /> + </MavenGeneralSettings> + </option> + </component> + <component name="ProjectId" id="1rSafzfDI3SH3MnHU7Ou2eua9FS" /> + <component name="ProjectViewState"> + <option name="hideEmptyMiddlePackages" value="true" /> + <option name="showLibraryContents" value="true" /> + </component> + <component name="PropertiesComponent"> + <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> + <property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../Automail-V3.6/Automail/src/simulation/Simulation.java" /> + <property name="project.structure.last.edited" value="Project" /> + <property name="project.structure.proportion" value="0.0" /> + <property name="project.structure.side.proportion" value="0.2" /> + <property name="settings.editor.selected.configurable" value="configurable.group.appearance" /> + </component> + <component name="RunManager" selected="Application.Simulation"> + <configuration name="Simulation" type="Application" factoryName="Application"> + <option name="MAIN_CLASS_NAME" value="simulation.Simulation" /> + <module name="swen30006-group-work" /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + <configuration name="WifiModem" type="JarApplication"> + <option name="JAR_PATH" value="$PROJECT_DIR$/Automail/WifiModem.jar" /> + <option name="WORKING_DIRECTORY" value="C:\Users\Stefan\OneDrive\Desktop\swen30006-group-work" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <method v="2" /> + </configuration> + <list> + <item itemvalue="Application.Simulation" /> + <item itemvalue="JAR Application.WifiModem" /> + </list> + </component> + <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> + <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="f1fdc998-0877-4462-bd63-261035866328" name="Default Changelist" comment="" /> + <created>1618972051470</created> + <option name="number" value="Default" /> + <option name="presentableId" value="Default" /> + <updated>1618972051470</updated> + </task> + <servers /> + </component> +</project> \ No newline at end of file diff --git a/Automail/automail.properties b/Automail/automail.properties index 5617235..2eba829 100644 --- a/Automail/automail.properties +++ b/Automail/automail.properties @@ -12,4 +12,5 @@ Mail_Receving_Length=120 # Robots Robots=3 ChargeThreshold=10 -CommercialDisplay=false +ChargeDisplay=true + diff --git a/Automail/out/production/swen30006-group-work/automail/Automail.class b/Automail/out/production/swen30006-group-work/automail/Automail.class new file mode 100644 index 0000000000000000000000000000000000000000..baa6be4309cf4d1ff4164509836a94ec8a65b972 GIT binary patch literal 1187 zcmX^0Z`VEs1_o;eD=r2m24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk- z5<5l)W)00SP6iGJPId+^9tLg(9!3Vi#L|-d+{DZreMcyRk%0rm56I8YVPp{Yfy?_Q zX6Aqdt=Sp)7#aBB;z9XI`6VDz1$Y<)8H5-a*or_R#f%Js(FomORn}Y#ybK~Bhl(;X z7;5+wXXcjXB$j06=jnTbjCV=R$t+7Ps<cMv0||p|_0$YwXAoy(5J9!rCABOwIhBh+ zj6o7)t`sAKnFd04a7kiGW^qYoa<NZ-I+Cf*8Hq*dsm_Tx$sqgli>yK6!pk7T!ywBb z$H>5z0ydSAK@4FO*aHyTtQi?nkSu{a5x0Ll5$2HKBt`}n=lqmZMh1SL%)C^;(%huf zqL9R-oK!{zA)ox@#GJ6iqD&AUD#)3aS`Kj`BLib5BLkx+BLhoGMrJWeJi_AHnvsDc z1sdRt3{toq&&a@;SDFj<e=#EiZ!vP1GBQZu@){$9Kr&h|GcrgcRAa;eBLi=6Nn&!g zZ(;%1L+lKO$mtUn%<K%tj0_UEk`6nADI<dzJdL1)HamkkBZDMd4&4Ea3|ztarA5i9 zZkeDU=7j~69w<jKC^B#`FflMNFflNKk~sqd10yI0foVntRt9+nMg|2228RC(><k<X z3=BS6+Zh<Ow6`*_Ysv0q;N8l=&uqpf$|k#r!9;5d1HUNSZU){+9c@vz?F_=fyBWkH zC0Qg{w=+msu|uSdB-ytzNVl*tF8_aKBLf2iGlL=n1A`g^Cj$cm7Xu3eF9Roo0D~Zd zAcGWx5Q7ebD1#+~7=tT=AcHr9B!dzI149r42ZJR84}&s;90NOp2!lC;3WF*G8^~=8 zY7FWOAm9V`10z^WgFzGQLmvh$22}=Tu$VT34g(9ArOTklz{;S{z`!8O!1SL%gn^x% gfrFjFfStjJk)6SWoxzNef#DZ}83QAO1vr>20WuyfRsaA1 literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/ChargeCalculator.class b/Automail/out/production/swen30006-group-work/automail/ChargeCalculator.class new file mode 100644 index 0000000000000000000000000000000000000000..09d7d3ef5a7db00ccbfbdf82ee5ac980f5302961 GIT binary patch literal 2175 zcmX^0Z`VEs1_o<}GA;%t24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk- z5<5l)W)00SP6iGJPId+^9tLg(9!3Vq#L|-d+{DZredmnCqV!bf#GK^PoWzp+B1Q(z z^31eM-~5!+Tt)_MpXB^p{nEV5+|-;T{o?Y}JYxd`12cV)l3b7y{cxCKYmgOuJPiB{ z0*nlTiOD6IWtk<Fp?R4l0Y#a~sf-MaE+7>`JPg7h6#}`5McJhV0jWjFsd*)d>8b1t zqKpiJU~iO`Waj95Bo=4*CKhlph%hjNG)nL=NHRz<GKi+-<mVR!rxulECa1ckrUs=Z z=NF|gG6?%%=(Xl#kYSKzXOQDzkY`W;xeDfM-^9!u&k~Ri1yfRsOEU8kOEUBG;=x8U zGBA3wGbk}K2p4DOf&wKoKTqGOG&3h9GcTQ;L4}b)6iFf&u7=G)gaHiL?03!tfmvJ( zG7MTg4B8Ajj0_URsU?m`fl?e=l9`iPm72oHz@p)z83t0T$HSlxQp=B|);Yhpgp0wD z!HAu~n1{iH!IY6fljt~MWROYAFDg$gN^wri$qC7K4DgKi$<GIcJ0wn6G(0t3KvtXc zFjz2HGBQY{r<MelCMTyB7pIlxK-4<tm*$m#laVJ#sWlIS4TCMjM>v#%j0OA1o`=B! z<RjkV)DlFLaWObCII}aj@G!VCxWOVFoOV6)N>bBPix?T$%Mx=+Q~lEz8N@U^H6c-p ztiqa$!Gpn*oxuxahBr$3cgZhJ%1LEp5Y=!&)(8={2Bjxo9tJ-Ke?|u8g3=O31`7=& z;~|;H8dC(>D5xTkQGq-RK@7o+4BW~2c_oRNdBxtTl_0CJ7!U<gAIifJ#t_cPz?`01 z!pNY8#cHe;c`!usFhns#Gcs_efV~$63LbErfTJ&#hanCW&YZ=mC6FA=$iNw#nVy$e zQd*SC$Y2F=4|2w`fe4`lDv}U1xa_PM84NT?C<R<xG{YDfSe)}yQW+WeeKPY>{YrC_ zQj0<o!I2{5lb@WJ6P8$%3F1QqSxPc8iy0ZDeQ=ga){G4N$<Q(?73M)P4TJ_*hPKvp zVPs&*1ZQnwEYhF=L}YkI243WXs+f_12gV2GJ4ObsVt6^j$RLoDSdv<dl#Ur0Sd#OL zK}BscxD;h%;0-QGOwRUAEP(n<Bpo%^LyJPL;QZ2}<W#pza5{zf2T=s;feJDPMFtKA zCI$uu76w63na#k!AOtE~!L%@g0GO6!kYZqDh-YA6U}8vMU}j)sU}Z>TU}Q*QU|^_W zU}j)rU|>+t+RnhJrM;DbT}xvt1Fx0@%T@+Kt=$YFk=q%>wlaus1nW*_U|^5}s~2Qo zVGv^AWDsWHV-R5wVGw1IXAomZVPIg;VqgK8$B@d91}^6m!0uuMi}5oEfL*HqD%}}a z7#JDS88RR)VQgYxW8i0CU|6cXg+bbuRfZ)cqg{kSHCu#1J=sfJa~p%Erq&h)-fT-& zZ3)(G47z-l>{?qG*k!gc7+7*jaPm!`&7iHVy^X<)C1D$bm9_-uHU>MbEezr^I~W`# zICn6(Z)5NYm*BKyU(TQf6W_)VFq1(B!3#OS;IWM%!jfHEf_)o<odl}{d$J|B1UJ9d z76!rOY)f8k3EpiCF%rD%85kIt89>3|#~{qWz#z%M${@uc!XV8c$sog^$RNw0&LGdA z#h}1o!l1}t&7j2K%Am~P&7i^%!=TEL%%H|l$e_;9!l1#>#h}G7kwKeb4ucNEA_iS> z5XLZYf&u~_gi9GR8M469wtyj<L4kpZL4;u<Lk@!g12cmnLkmMLg8&07gBC+ILmq<w z13QBWLm@*xg8&03!$bxVh5`lw25yEq44e#w3<3<i3`GnK45AE7{~3}Q*x4C4*coIP znVFfH85q<U7#WHgq9O6YpwGa>0E#tMP^g3a%LMi>8(7c~>`opqn-%I#Murk_A}Iv` Dw1Ng| literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/MailItem.class b/Automail/out/production/swen30006-group-work/automail/MailItem.class new file mode 100644 index 0000000000000000000000000000000000000000..84505bc150c5474ed6092607892d215ab7809baf GIT binary patch literal 3504 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 JCU9151^{1akIVo7 literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/MailPool$Item.class b/Automail/out/production/swen30006-group-work/automail/MailPool$Item.class new file mode 100644 index 0000000000000000000000000000000000000000..79afe304471aef01482e503707ba658a01baa53d GIT binary patch literal 695 zcmX^0Z`VEs1_o;eJx&HD24;2!79Ivx1~x_pvBc7n{M^LM9DU!!%$$Jy{2Ud}lGI#A z2DXxn%wiP-Mh0OY3?<fF3>*xc><nBy4BQMnj0^%<iDilUIf;4c`u<5-smUdb3~V-; zd6^}4j10^gnqeS2`FI%k83Y&^I5Ug=Qp+KBFh+4P2r&q=Gl=joh%$&VG6<qr1yRJ4 zo?7CPT3q6mlb>G%HqR4eo&*nrB!d(q19wVlaY<%gVo7Fx9wP%ISWbqAL6$*|k%0r` zF^DN>z5oeYGcvFxXCxM-r!q1yx-c?mYGCmxst{P4W*8#_i*tTTDkB5GPi9`KUukYq zYEejHQcfx(gOE>ta$-(cVo@fD4;5qqg(V|{1gc^1z_w;&;0n$!ElN&x%LJLh3yTUp zP`ENOaQLMbmw4nCm#{NvqlXd55Jm<b&%C_UBIlgM;^Nd|Mg|s;I~f!hm>4)17#LU? z7(hYA00Qz13Lpv;6<}JHL5_hzKme2$7#J8B85kM3859{98I%|p7!p7!g@J)VMoW7u z1Ebb<26io$tqi<cI@=fow=#%p>1<_?-pIhfz{H@;z`!5|wnvtMlR=V!k3o(>j6t43 ynn8g<1uVw|GKWExK@DuH3@CcQrmKVXYcObnX)OjF1_lN$21W)Z1}z3%1||U79gv3r literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/MailPool$ItemComparator.class b/Automail/out/production/swen30006-group-work/automail/MailPool$ItemComparator.class new file mode 100644 index 0000000000000000000000000000000000000000..490b1b6e9c02a12bd1c99189178c187f7508f03b GIT binary patch literal 1062 zcmX^0Z`VEs1_o;eeNF}@24;2!79Ivx1~x_pg~Za5{M^LM9DU!!%$$Jy{2Ud}lGI%1 z{M>@XqQsK?B1Q(bl8nq^6$3^FVIK^|)?5r644mu?Ts#ci3_Oes0$GV=iTXK-dFlH8 zNm;4MC5#MgHko;uC3cJq%o>_uoD6&n{Ok+@JPd*iLW~Sz7zToEXJp_`Ni8nP%u6iE z%+F(FVD#i-U}6yAVGv~yV`N}Y20Jd5k-=C4(?wtdtZ|8Jda^S}FfxdMompCvnWK;F zQ!y;&S!;$dGO#%3r=&76@cU%urTUfTCZ!gIBqrsgGBODH<R>TQge4Ybg7{ED7EpjO zGAQA21j0sZMh2!#Lq-M(94f)`MvM%s`9&$IMT`u*!6k{w*}jPdP>a+xe83(-3U6yn z5lv4<2F~Ej^t{B9(xOyG1}97<5D~QSu)*ajJ8MP;uHgLAqU2P!Oi(EB!qSc&$T^G* z9Db?AB_8?3CF~5^j0}Ppk<7@z<C&M2TI8IQSX`W1%*eopp5|CU0t|`_Obi?hj11xo zi~<6n^vb}%z|6qNz|A1Zz{nuQz`$U~z{J4Bz`($zrM;DbQENK``$h%^1||k+1_lN; z21W)324w~r1_lN(h$;qI1~~>0-~yY*$iN6nQc$zH7?>DX7#J87neDW<F!1VZVc=cF zz`<g-oIwD_U&6r3WGA}@><o|<QVeVi3=C=vObqG_ybKx)LJXP=vJ6@b@(em)YqcN- z!mU+gkY`W;J4=y4kwF3MczFgT1|bG!24w~Y26hIfKMX>QJOYjkq6{ifcbPLVGcYqS zFz{+=A7J3qIl#cTjX@aX225}AfX(KG+Q-763Jwf426Zs4!JrAIwHS057#M`Wwrery PGB7gmF=#R9F)#rDh0Ny{ literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/MailPool.class b/Automail/out/production/swen30006-group-work/automail/MailPool.class new file mode 100644 index 0000000000000000000000000000000000000000..2d36ebcc7e492cc1738d6ccb105ca2de1696c1d8 GIT binary patch literal 5181 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 literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/Robot$1.class b/Automail/out/production/swen30006-group-work/automail/Robot$1.class new file mode 100644 index 0000000000000000000000000000000000000000..f4b86da3a1131e34928f98df00cae486d4e9b951 GIT binary patch literal 746 zcmX^0Z`VEs1_o;eT`mSD24;2!79Ivx1~x_p$;8r<{M^LM9Q~mDr2G;UFd1BuSdz-f zz*d%+Q<_@L$RMYo8SR5pp*1H12LmTN0~ZeiHv<nNg8-UJLq-M_mEiKslH?5E!~zwV zEW|1Z3AK<Z+LM!kiGh!YfuBKuk%2SFH6%31&(qJHkwF@d{U9$1@h}K8h%hp+=NF}9 z<|XDZGB9gsda^T!F)~PHC6*=X=OpH(>-*&gmnLVpWv1q&xE2-V7lCY(;9-yi*~T93 z=o#Ya=MEB+=3$TliE+8O`gn%926_6qvopvsG6*1y@=wZ2O)g<%;IK)~$;`_vu>;!} z#>l|poS%})$iVNDnV0HUnwykb6q1;flgh{-<ddJAm=l&*lnLTP1$l!@5|gui6APex zuHgLAqU2P!Opp#PaBS#-EM;Wicg;)A$uG{#OZQDJ$;eM(XV7G1;Dd!GB>ET`IQ&wJ zOFZ(6OBfk=JoEBWi=1;3i;F>#2r&#C(gF$$91OAy3=E6{5}-H(u^2cQ<QWtg7#S29 z7#P|Zm>C!u7#PfVFfi`h!?l@#eG>@rZetK+@n6os;tl4CZ(|T-MR29IF$l7Oxf>an z88{h47{nPw86+5#8Ppg=8Ppk!7)%*N8JHQA7#JAXz{Wc;C^IlHFflMNs4y@v2r{sR zvonY?_`(SW76w(Y0yPG81_lNe1`P%V1}(6N27@*O1A`C)69W^227``+Bm)Nn0|SEq F2LQ4HqxJv* literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/Robot$RobotState.class b/Automail/out/production/swen30006-group-work/automail/Robot$RobotState.class new file mode 100644 index 0000000000000000000000000000000000000000..f84c635fb911e7cae6dca4d36b5c49295d8b774b GIT binary patch literal 1156 zcmX^0Z`VEs1_o;eYjy@EMh3~m(vtk##LOK1p!}r#5*08RT#{Il%E`dUz{118%D~3R zz~$oV;~C}}<mu<m$RO>5Q;#)B69*3iCrA@}xT9x?r=L4WjGKpn2PDQB<Qfth<Odby z<6+=u5MX3rR|#|U33Ux-WRQu*V>lOs5Q8u~g8&bM2!kji18Z_leqJgggNTNvPgY`C zqJB<dUb?=2QdVkmi8U94ID-T`gCq}w6oWJ)10O<xYhGzCBLjO`VoqtQe;Ol$sRoj6 z=bXgiVrwLU;F6-uymV`18$bqt&6nk2kYkW%WMH$&%*!mXV`LCRHVUfKQ!|W%ft8Da zkwKP&fs=!Q2gFq6VNhdG2YDRqjABLxISoyGUT0)rgQ;Y3&QD2YWZ?J7%uDqv%}q)z z3Q0`LNo8cv$6~uCp5SC;5c0`SPRt2QEXo9#05ygsFEKY2B!>txs8<*nSV}T7iy0X> zgEQ0f5=%;pQW+VTH8jH*88~c`bD)8sixhgGpt8Z^1UqX+2Cm@z(xT*4w@i>9xWMU8 z4`ekX1BYK~afwHMaS1zv1tS9=YN}&o;PK4MODzJ&SZXmN14Ju0={guPFfxcUFfgz< zNP-eD1A~JkC{2QC9tJiB1_3Eh%41+)U}fNB&|pw!U}Vr_U|>*UU}OLRu1yTQ+ZY57 zFbHj6U|?Wm&|+X<U<1pEGjK9UF=#{8n=mkeMY)6+wRSLw9bjMtsb@k_ufxE=zyndm zpv$1gz`(!+N;V8kU>gk?m>HNE7#P^Kv}Lw4$ZP~lBU^{i&d#6@ayo+nSdF0o7bp!u z9iq>`0&+KlINM$Z#z^K(49vliESnhEgCkitF>nQgT!rcj4hACzP$+?X?FQAXx0``6 zQb>V$JA>k824*lvi3QAI2XmBJ!5pp~3@V!$ctK7@HIoJEG-C!6uoF!g%)qocgCzq4 P11Q}yGMF=1IY<Hkzd!9` literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/Robot.class b/Automail/out/production/swen30006-group-work/automail/Robot.class new file mode 100644 index 0000000000000000000000000000000000000000..9919c918bb21e69035b0a3ed5e181144798f9e8f GIT binary patch literal 4835 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 C#h9!B literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/RobotDevice.class b/Automail/out/production/swen30006-group-work/automail/RobotDevice.class new file mode 100644 index 0000000000000000000000000000000000000000..a330cec7f07993afb51d58e1e2b613eff84b7fa8 GIT binary patch literal 1065 zcmX^0Z`VEs1_o;e6D|fO24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk- z5<5l)W)00SP6iGJPId+^9tLg(9!3U{#L|-d+{DZr{h<7${1TVcvdrXEMh4#ElEjkC z;*!kdVxRnUMg|EVxVm6u8EcSnd^`;N3<8V{0?8SPMd_)|i8;xoIf*6tMT`v62z}0I zlGa=dLJY#}3?e)Xq6}h;43cmg&{Z-r@FzpfOohlXGKgs)O!iI8%<(Kq&9&BaVP}wF zWDqUR%mq0hGe1v17|vv~-#HTmW`XRL;bD+vkYi*JNlz_tOfJbR%Pgr3&C4taC<1$* zSwqu>i$Q@wk)1(_he4S^g^@uF?mUzLU}O+2N=?o$N^wce$t+7PsthhoPEIW@W@He@ z=0X?EFh&M5BpDRLtPy^K_!AM7)*y{6&iN^+j12rfnR%&xrMXF|MInhvIjM{cLO%J) zi8*13MVTNzRFI`4BeR&1K@4FiQWRS=GKjzf)h#nGF$ZEJBLhojNop=5gD^rHJbW1$ zc+x;h;~^2v$iV1=D<;Ai8H5v|0UKYMmst{D00~;I;QZ2}<W#pzkh=wtT%-p|xD1L6 z91Khh3=B*Rf}jM-z`!5~N?Z&K49pCS46F>Q42%qF3=9mBpj6Mmz`(Dyoq<tHdn*IG zmd;iN-i=_b>I@7FLJTYn3=CWhEDYQXoD4h+d<?t{8Vn2!3JlC3Z48<WS_~k-54MI8 zEXL0uz`(@7$e_(22DK)Tfdy<1zt$E8UhQoRf+7r(>7E+v;nsk19|MB`122Oh4&!wg zbQu^Kco~=&^ceKP#w#-zK#h-p8ZQJgej9_dr`8q*c5RJq4Dtw%@PQpH%D}-O#vsTb aj%14v+!I0!5L-AHxEKtfwitokXbb>Q!0~+m literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/automail/StatisticsLog.class b/Automail/out/production/swen30006-group-work/automail/StatisticsLog.class new file mode 100644 index 0000000000000000000000000000000000000000..b7db77e221ec240e3a6b29c7b94aa2204d88d8a9 GIT binary patch literal 1677 zcmX^0Z`VEs1_o<}P%Z{024;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk- z5<5l)W)00SP6iGJPId+^9tLg(9!3VS#L|-d+{DZr{os<slFZ_g%;aL9{B%YJE`LAQ zcpra%@6Z5721ZYiHa;E(evlsFlKhgy9M6)}++vs1oXoP+qSO?SydV#Q5Q8uygD6<u zDKjT0F)1h2F}WnOEVHDNk%7^Li$Rn@jGaN8he3itl953WZn<w_CfGnm2A=fP5|`BC z61SZE{35WEJ=qzg85x9&GjmIG5=%1k^YoocGjmch^U^_<%JMMCfh-jSTMDzxIls6B zB&)!~pa_x`0Luoa7L{ctr-CFwE>Y%TP+?GIWZ+FtErCk8rKW=IbOC8r=V8zQ`!}yN zH@Gx8IkmVrtu)6cKR>&)0Hj}whd~?U4GEBbG<oOz(mb#Wba@!`K!)(=mFBu7X6B@( zKnws`V8Fv*2$JIlyAC4G!C=hDup<N%!U~z7AXZ3$g|U@_YKj6EL@Egyx(bQV;I&dv z)iX+iNy9`HlJkp8P^F3?fq+FO4eUIH9IywAk!>r6`wp8dk_IjYQwB4326G+;3kFL@ z20=t(^vo+sO;0UiWMD5#%qdOvPh(^d)9}>v!BAn%#bC`~!_Hs}GQ$ofLA&IaCgr3u zGKgxpAZvsOTXQiuFgUU^IPowzGq|AW3oa?j%u8ovU`xv{%1ta`WU$mgvKJz29gQRe z$vM`@mOxc8GVnU*=M|SE=9Pqj{K3q?z`)4Jz~Y>rlFG=y?~|FA>Q|bZlv)%5O8blq zLO%J)i8*13MVTNzRFI`4BeR&1LBa=~{!ucYH6w#)QEGC2Q3^DBRYFrABZIgGLJus@ zSi5M3F*5K#lSw5gUotWXV^IgnaLJI&7@C(^5>S+xoXW_+QIZew8zX~=238+)1?QI* zC8xS&g2G-1#i@Fr=wnc1;9y{4U;vZ+3_J`B3{0Ss08Gm<2!m-wD6IjN*MriAU|I-N z8Zj_3xPsNXF)%YQf{HT+Mh15V1_lcTCI&_Z1_myz?F@`sEL$1aH-go9fW*KyvoWwR z@H2QaFfi~yR5Exmc!Q#b!H2;YYRXOqkSYd-c&*4S47@A}TN!w@w6-t^uxf8(5MfEl zXiw%(-pU{V7SqVy${+(`$!l+8P)gp)AP?fGX>ViDOxVhx2IA;|^l7FfY-P{^an-c8 zFz6&~Wza`BO^Jbnfq_Aofr~+eL5@L`L4!ez!IVLq!HGeFA&^0mA&x-`>|_N7P%4Ut zI+=kXp23g7AMA~Ih5!a(u;&9Af}q~$U|<8w1qm4mu<vDHie%Q>!oa(O!6Z161>~I_ z3|7IBtXf+bWWX#ott|}lU=};bg<y3YT3Z;@z$^ifv_6QrgTa0SJWz!gSQr=><QRAv bR2WPdR2lpj<iIY41a1)2rHl;0U>zX<ix7-g literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/exceptions/ExcessiveDeliveryException.class b/Automail/out/production/swen30006-group-work/exceptions/ExcessiveDeliveryException.class new file mode 100644 index 0000000000000000000000000000000000000000..08aad8a953a1254464680270c1dcc4d40aac1f38 GIT binary patch literal 422 zcmX^0Z`VEs1_o;eVGaf+Mg}X#l9JTif|AU<bcK?9g_P8s%(B!Xh1~q2RE3g^#5@HP zh0K!F++u~yJcUGs;>^7CoK%I9qRawCMJ@&w23B?kHXa6c1`b9B;jF~6ME#t^ymbAL zjH3MV#H5^5Mg}&U%)HDJJ4Oak4IhMp;F6-uymV{LFm?tmMh4Z?isaOSlFa<PVtv<& z<kaHg%(7G$h)XI#0$@2t24)S-Fh&Lz=lqmZMh1SL%)C^;(%hufq7aBxLO%J)i8*13 zMVTNzRFI`4BeR&1LEVQaJFFQQxPtRbi;`2_GC{7F2icC@IeH-9Feox`GO#d!03!n< z13LpZ10w?u0|SF80}}%y0|NuQmJs812Ih?n3=B*RybKHsTntPM3=A9$Yz&+Xd<+Z> UJP>6J{0ssN3=E76f?$<G0CS;i-v9sr literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/exceptions/ItemTooHeavyException.class b/Automail/out/production/swen30006-group-work/exceptions/ItemTooHeavyException.class new file mode 100644 index 0000000000000000000000000000000000000000..6b63b5aea881527727a30c760caaf22dbecb571c GIT binary patch literal 382 zcmX^0Z`VEs1_o;eVGaf+Mg~RClGI#<lKgyyjMT)kN<{^iqWpq_)D(rJN`<2Qr2G;+ zE(R6`R(1w99tL&>4n_vyti-ZJ{hY+SbbZ%~<kW(a%=|n?1~!|_yv!0iMg~z0AB2M7 zlA_GKbZgBpb_Om+28C3Z`eJ>Mts(jO9w0lBjA7Q$3}a+qan4UkWn|#@$;?ajE6q(x zEec6Y%1LEp5c0`SPRt2QEXoA&p@J+W8JWe53`#zPjJIZF;0n$!ElN&x%LJJwh1C&y zAm=kEGH^1mFn|Cf10w@F12+RB0}lfOgDC?O10w?i1G|<G<8}t-jSLJ7ObomX3=CWh iObiSR91Ls>oD6&n3=BLFWeofb0t^fcj0}Qcl|lgT=3PMm literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/exceptions/MailAlreadyDeliveredException.class b/Automail/out/production/swen30006-group-work/exceptions/MailAlreadyDeliveredException.class new file mode 100644 index 0000000000000000000000000000000000000000..e7dd4663015f63d500e69378e627c4a65d8f8bf4 GIT binary patch literal 410 zcmX^0Z`VEs1_o;eVGaf+Mh4Z8jLc$%+{DZrg^a{vg~Xhq)WnoZg{0KfJcX3hoXoP+ zqSO>cE(R6`R(1w99tL&>4n_vyti-ZJ{hY+Sbp4QwqWtp2q?}Yn1~!|_yv!0iMg~z0 zAB2M7lA_GKbZgBpb_Om+294B;<kW(a%>2A!ec!~)97l+KE-;&1VbY8Y%o>_uj0`N! z`6;Q44E#Qsd8vM-xk;%-ArRYyeDaeMbHWmfGC_Q(AWKO`W-%j!mJhMkSTizk1?QI* zC8xS&g8ZO_*HL;PZ!st`a5AtkfB+){BLh1FHv=OB4+8^(DFYJ&BLf2iyOt2+b_V8+ t3=9lR47>~s3|tIM3=9k$3~UUX415d>3_K8J4EziN3=9m641!>lLI4+YXj1?H literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/simulation/Building.class b/Automail/out/production/swen30006-group-work/simulation/Building.class new file mode 100644 index 0000000000000000000000000000000000000000..0f00f6faa3467bbb51db9465461193b9bf4ba825 GIT binary patch literal 380 zcmX^0Z`VEs1_o;eF)jus24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk- z5<5l)W)00Sb_Nbc2I1n&+|r!HlFa-(eW%jQoRrMGbVdd?Hy?lhpkPJ@Mo&ft9v}a3 z*Wi$Nuoxo)uXBE0aY<rcNmyb|X(}@V0|O%?gP^aYr%#Z-zi+&czq4bAr@tQ~1B-Kh zN-84*zfWdfs$XetQfg61Vp2{jBZH7nesW??SYlBohz}KHDaptzW@Hfc!QvomMh33n z{L-T2RJTl!0lYAm>Vdq-pvb_^z{J47z|6qOz{$YHz`!8Mz|FwLz{tSEz`(%7z{?=X zz=y(TWMBk^5d$LwKLZ1UJ_Cr)z`&}toq=&9Sc?Dy0|OfaBiK+u1_lNmFq@S@h(Q?S KVFnSfDp3F@eMz?f literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/simulation/Clock.class b/Automail/out/production/swen30006-group-work/simulation/Clock.class new file mode 100644 index 0000000000000000000000000000000000000000..99978284be7def59fa5a50fd67a84ce778567047 GIT binary patch literal 482 zcmX^0Z`VEs1_o;e2`&aE24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk- z5<5l)W)00SP6iGJPId+^9tLg(9!3U%;>_IAoWzpM{5*Z<oc!c$Mh2FU%-mE)21ZXt z1`%IJPoMZ8S7+BSPe1o~A6Gy35D!KM7U%qwR7M7VpUk{eztY^K)S{5Yq?}Yn1|gsP z<iwn?#G*_PA1cUFl95>ql0&!38tfuZu#F&#Ic$=1pf2SK&Mz%WPIb!!naTxrm>$Su z42ldK3``6R3``7MAP+DwFmN*PGVm}kFt9K%f<l0Sk%5nafkB^vk%5tcfq_+PI|JiJ zum*kx1_m~;ATxsi0|NsOn9a%{$RGqZhMPecs#yjs!@$6@iGh6$0|Nsi141tk11EzB z*c^~Gs$j=3FmP^SU}s6#%)kz^3ZfhoFANL<3>*xC3>*xia4oV>!&#Y8ltWwwBE`V2 G6$b#prAbi$ literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/simulation/IMailDelivery.class b/Automail/out/production/swen30006-group-work/simulation/IMailDelivery.class new file mode 100644 index 0000000000000000000000000000000000000000..8f5b988aa4e7f6927f67b513ff8d941c9a06ac42 GIT binary patch literal 161 zcmX^0Z`VEs1_o;ePId++Mh1!E%-qtP#FEVXJbh2!#LOI*)SS$+)S^mu1{OvJfvm)` zME#t^ymWp4q^#8B5=I906o>*w1~Cnv#L|-d+{DZreUMJilGI#l%`ip=uHgLAqU2P! r%$!t41|bwv^*{!)F)}bRFf)JvBMTz~D+3z?0|O%iI|Bm)69WeTCow59 literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/simulation/MailGenerator.class b/Automail/out/production/swen30006-group-work/simulation/MailGenerator.class new file mode 100644 index 0000000000000000000000000000000000000000..eb4e0e44c8d243f6b973b0443a2526a028c5d34a GIT binary patch literal 3847 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 literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/simulation/Simulation$ReportDelivery.class b/Automail/out/production/swen30006-group-work/simulation/Simulation$ReportDelivery.class new file mode 100644 index 0000000000000000000000000000000000000000..8cb8471f828813435b05978cff702786365c015c GIT binary patch literal 1615 zcmX^0Z`VEs1_o<}WOfE7Mh4O1%-qtP#FEVXJpEuelZ%0cft8(sjfa7qfrF7jAS<yf zQ9ma!FJ0e1DJwO(gpq;GCNnRy#Ey}HSwl07lYx<ei-&=mfrpWS&)3n@C*H-?$1}_| z$km0BLDUDVyR;-TN8hoiD6!Hfv$({Xi-C`UpPfN~he41*h><}UiyB4-j^zBjlElos zVnzm04Tv#Fj<D8@0+}Mh!ypPWf;llI1>_KM9tH^pNk#_tvecsD%=|n?2F55(25ANv zb_Q7<1~~?K6#oQQ7MG;vGBPmdmzKcYnwhU3P?VWh5?oT0nwV?N!Jx><AQxh#plY0= zV5i`cnv+?UT9lfip=y$%sSvGN9IKkg#h}cf!p@+|!=T2X&d4Bu6s*oU`N`Rg3@jm; zxvAjr^5kOBWYA(~(B@&#VbEn{5CnT3>@&~2lGOCnB9QA7b4pYF(-;}VG(0tt{0>zC z4nTb#1_O|7EXA2ssay<3494sXCOizL3}%cBf{CRi`MHUiIr_ednK_<dPjZ#y2bUCO z=B1YzF*1l~AR7x2x8`E7V6bFou;O8`X0U-p3u<sMGO!hZ0w;};!3H@}pe95kxfPOF ztfBUx8e<J|uN@DAJ;<>fFo%I6(2<A1iNTqXfx9HXBrzvGB{e6pl97SYg^Pia!Ig)> zjlrFfK`c2jCmED(Q=zd@=>kzErs0F(acfN%b_P#I294B;<kSLCQZEJviepYuYGMjV zCnP>yVbWX-9t^A?!iR^!7nA|`!9ETyNleZTDN0OEWoPhbWKcnhV?@?b2}&)<FDijK zi=82mkwF4Ur6(vlV6u!1EYA5Usf-N#KACx`ex<odsYM})Nja&E3_?En$%#2(iA9+p zK2(sUBqOt!kwMJ|$v~V|TQf4Sr$EvwC>3D~moP>K##BZIEgxb-#+s3V2Wn;|Buxop zF_)2n7aUf;i3L!Ha|P#@7A2>;WrDoMk8rXcDCsjYaQLMbmw4nCmoPH$c;@A$7CGl6 z78j=$Gcxd@1}B38gC7G610zEK0|NsS0|TghVqjzlVqjp<XJBMtWME)m)!NR$yb&xN z%)r3F1{U1P5W>K~zyoHpGK4aOF)%PNGK4ckKr}OoF|aW(GcYi8ZDQcm-p0T?i=h<4 z5)R+QAjYzQL4Om2l#l}3UIvy(<{b=5I~X*ABUv^vaBgGJ1G8DRw=oz7Z(}eIU(TRI zgj!p$+D!}&+B+Crk~cFrEN2kd&EOHaoxy9rug*3G?~M$M3^fcb3@r>E49pB5pI9;Q zF)%RfWZ+`h#URA6n?aIc4}%rMUIsgcJq)f4`x(+04lraf>}SYhILuJPaGarq;RHh~ z!%2othBIK_D=;uKv@)<TL^4EygRTo24h#%k4ABfR42%r1;4otS&ETrR>(0*L!NS1I c5C;y)c!mTp&B&0*z`y{?iGB=>3`q<e0OS#zI{*Lx literal 0 HcmV?d00001 diff --git a/Automail/out/production/swen30006-group-work/simulation/Simulation.class b/Automail/out/production/swen30006-group-work/simulation/Simulation.class new file mode 100644 index 0000000000000000000000000000000000000000..46ae81c465186ef22075e9dbae0efc838419a566 GIT binary patch literal 7811 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 literal 0 HcmV?d00001 diff --git a/Automail/src/automail/Automail.java b/Automail/src/automail/Automail.java index fff050f..eca5758 100644 --- a/Automail/src/automail/Automail.java +++ b/Automail/src/automail/Automail.java @@ -1,8 +1,6 @@ package automail; -import com.unimelb.swen30006.wifimodem.WifiModem; import simulation.IMailDelivery; -import simulation.Simulation; public class Automail { diff --git a/Automail/src/automail/ChargeCalculator.java b/Automail/src/automail/ChargeCalculator.java index 5ae2ff0..ded29f8 100644 --- a/Automail/src/automail/ChargeCalculator.java +++ b/Automail/src/automail/ChargeCalculator.java @@ -4,33 +4,43 @@ import com.unimelb.swen30006.wifimodem.WifiModem; import simulation.Building; import simulation.Simulation; +import java.util.HashMap; + public class ChargeCalculator { public final WifiModem wifiModem; - private double activityUnitPrice; - private double markupPercentage; + private final double activityUnitPrice; + private final double markupPercentage; + + private final HashMap<Integer, Double> floorServiceFeeRecord; public ChargeCalculator(WifiModem wifiModem, double activityUnitPrice, double markupPercentage) { this.wifiModem = wifiModem; this.activityUnitPrice = activityUnitPrice; this.markupPercentage = markupPercentage; + this.floorServiceFeeRecord = new HashMap<>(); } - public double calculateCharge(MailItem item) { int destination = item.destination_floor; double activityUnits = ((2*(destination - Building.MAILROOM_LOCATION)) * Simulation.MOVEMENT_COST) + Simulation.LOOKUP_COST; item.setActivityUnitsUtilized(activityUnits); double activityCost = activityUnits * activityUnitPrice; item.setActivityCost(activityCost); + + double serviceFee = 0.00; double latestServiceFee = wifiModem.forwardCallToAPI_LookupPrice(destination); - double serviceFee = item.getServiceFee(); - if (latestServiceFee >= 0 ) { + if (latestServiceFee >= 0) { item.setSuccessfulLookupCount(item.getSuccessfulLookupCount()+1); - serviceFee = latestServiceFee; item.setServiceFee(latestServiceFee); + floorServiceFeeRecord.put(destination,latestServiceFee); + serviceFee = latestServiceFee; + } else if (floorServiceFeeRecord.containsKey(destination)) { + serviceFee = floorServiceFeeRecord.get(destination); + item.setServiceFee(serviceFee); } - double charge = (activityCost + serviceFee) * (1 + markupPercentage); + double cost = (activityCost + serviceFee); + double charge = cost * (1 + markupPercentage); item.setCharge(charge); return charge; } diff --git a/Automail/src/automail/MailPool.java b/Automail/src/automail/MailPool.java index 9d3ce33..de0f10d 100644 --- a/Automail/src/automail/MailPool.java +++ b/Automail/src/automail/MailPool.java @@ -1,7 +1,6 @@ package automail; import exceptions.ItemTooHeavyException; -import simulation.Building; import java.util.Comparator; import java.util.LinkedList; @@ -104,17 +103,6 @@ public class MailPool { } } - public double calculateCharge(int itemIndex, double serviceFee, double activityUnitPrice, double markupPercentage){ - double robotsMovement = 5.0D; - double remoteLookup = 0.1D; - int destination = pool.get(itemIndex).destination; - double activityUnits = ((destination - Building.MAILROOM_LOCATION) * robotsMovement) + remoteLookup; - double activityCost = activityUnits * activityUnitPrice; - double charge = (activityCost + serviceFee) * (1 + markupPercentage); - return charge; - } - - /** * load up any waiting robots with mailItems, if any. */ diff --git a/Automail/src/automail/RobotDevice.java b/Automail/src/automail/RobotDevice.java index 21ac18e..6a9bdb6 100644 --- a/Automail/src/automail/RobotDevice.java +++ b/Automail/src/automail/RobotDevice.java @@ -1,6 +1,5 @@ package automail; -import com.unimelb.swen30006.wifimodem.WifiModem; import simulation.Simulation; public class RobotDevice { diff --git a/Automail/src/simulation/Simulation.java b/Automail/src/simulation/Simulation.java index 3fe8e05..9442ce8 100644 --- a/Automail/src/simulation/Simulation.java +++ b/Automail/src/simulation/Simulation.java @@ -99,7 +99,7 @@ public class Simulation { if(mailPool.isNewItem(i)) { double charge = chargeCalculator.calculateCharge(mailPool.getItem(i)); mailPool.setItemCharge(i, charge); - mailPool.getItemInfo(i); + // mailPool.getItemInfo(i); debugging print } } // Priority sort the items @@ -122,7 +122,6 @@ public class Simulation { } // Simulation is finished. print results printResults(); - System.out.println(wModem.Turnoff()); // } /*---------------------------------------------------------------------------------------------------------------*/ @@ -130,18 +129,18 @@ public class Simulation { static private Properties setUpProperties() throws IOException { Properties automailProperties = new Properties(); // Default properties - automailProperties.setProperty("Robots", "Standard"); - automailProperties.setProperty("Floors", "10"); - automailProperties.setProperty("Mail_to_Create", "80"); - automailProperties.setProperty("ChargeThreshold", "0"); - automailProperties.setProperty("ChargeDisplay", "true"); + automailProperties.setProperty("Robots", "Standard"); + automailProperties.setProperty("Floors", "10"); + automailProperties.setProperty("Mail_to_Create", "80"); + automailProperties.setProperty("ChargeThreshold", "0"); + automailProperties.setProperty("ChargeDisplay", "false"); automailProperties.setProperty("Markup_Percentage", "0.059"); automailProperties.setProperty("Activity_Unit_Price", "0.224"); // Read properties FileReader inStream = null; try { - inStream = new FileReader("swen30006-group-work-master/Automail/automail.properties"); + inStream = new FileReader("Automail/automail.properties"); automailProperties.load(inStream); } finally { if (inStream != null) { @@ -171,12 +170,10 @@ public class Simulation { // Charge Display CHARGE_DISPLAY = Boolean.parseBoolean(automailProperties.getProperty("ChargeDisplay")); System.out.println("#Charge Display: " + CHARGE_DISPLAY); - // Markup Percentage - MARKUP_PERCENTAGE = Double.parseDouble(automailProperties.getProperty("Markup_Percentage")); - System.out.println("Markup Percentage: " + MARKUP_PERCENTAGE); - // Activity Unit Price + // Activity unit price ACTIVITY_UNIT_PRICE = Double.parseDouble(automailProperties.getProperty("Activity_Unit_Price")); - System.out.println("Activity_Unit_Price: " + ACTIVITY_UNIT_PRICE); + // Markup percentage + MARKUP_PERCENTAGE = Double.parseDouble(automailProperties.getProperty("Markup_Percentage")); return automailProperties; } /*---------------------------------------------------------------------------------------------------------------*/ -- GitLab