From 8a53aefd483a617a59b723305af0c6b036cda001 Mon Sep 17 00:00:00 2001 From: Chris Punches Date: Sat, 29 Apr 2017 20:32:09 -0400 Subject: [PATCH] commented stuff --- .idea/workspace.xml | 70 ++++++++---------- .../ftests.dir/src/loaders/Plan.cpp.o | Bin 245896 -> 245856 bytes cmake-build-debug/ftests | Bin 1436584 -> 1436568 bytes src/loaders/Plan.cpp | 12 +-- 4 files changed, 35 insertions(+), 47 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d7d6338..ab27815 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -15,18 +15,10 @@ - - - - - - - - @@ -523,12 +514,12 @@ - + - @@ -612,8 +603,7 @@ - - + @@ -744,8 +734,7 @@ - - + @@ -1022,16 +1011,6 @@ - - - - - - - - - - @@ -1058,21 +1037,22 @@ - - + + - - + - + - - - + + + + + @@ -1090,5 +1070,13 @@ + + + + + + + + \ No newline at end of file diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o index 5f91c617b708770601e031c707510f7e69ee161c..66152b7c9abe7310907cbe5bf911ac79625c2c89 100644 GIT binary patch delta 5306 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 Kf&53cQU3?|jdRcd delta 5455 zcmZ{n4^UNA8oxHR>FsGQC%oq3$BZo(8K1^^Mm*(UEX4PgCsgQ^vAgxz z25nT+zuV22>Z|kU`j`@2NcC;^1S1;t6*lrEOm${!e20m9bgpN(j}}#Z^&U0^!5Us! z$5_ALDX;HktQzHQZQW{d_R~Si^1ULuH7@Z4nopy6IXNl55{zp80Fz8*-=HC;Uc`Tv zRX`r*Hbs#dueraTvFA~|oZMC4`B%OCiZ<(bwOU(l6ThwLH~Ms?UetY-Xsg1o%_#3^ zZkxsV&ysB|sDImM`&LALK8~k|oX-d4q%_d>=De;shh@a3X?g*({j!$HZVP|lN%YA@ zkdGn{OUYOjAKO5ueYzCwq{td1HqZL6Y3_OgXHBSnf+ADUjM)mcz&Z-d zx`viJC|*vUGVs3?7=riBff5Y-RT=IGSF2;dBy@NL#mhq)MP=)-F^f@o2}PcgmZOxb z_|)QH%~Ja+c3O0{-p@~q{-;wtk^A+Z*e<-NZ(?0uWa0T_qy)AO%=uS7rzn_ZRbQ3| z(Pzar7B}ti_mIr*}B4O zwj!xR@p6ik728aSnow;+k#!2ry7Ec$-Be35t1trrEWE+)0b+u{!}_9%*8HnFsA z5`RbRZks&i7FrV)JWGUwcbH2xMUdewF8D~hg(lu?9D+BCoUSC>2sGsP z8E=T?UE`IeW^J{Wt~9wn&W#ux$z%9k zVT^6yQ@xv408<5G)2$wO(m zKpJDiz&TH~JJNM*gpJn2W`K)uktKRG{SvUf0Y1X-Sn%ZUB;F1u2=6i_kCsI1{~@EV zTB3gpl|Da0;(Uw_q4za5W9RuRrEZ5=goo(Z*m-e?#E(J+;d!R$N04Ml%9cX|;dLfV zWqIZS$=`=dgirhiz6voX`c*bn9ecVf)`Uf zwnC^y%-3pOd?N(Nd56XM+V|4A4)`;w-FaTeRF=V#X#HLEUc*LqyEc57t7&! zNL+y0Yv4npW3?$J&J^RL$Y@GI^DCrY`o0KvXDlnHb8eiSi3@_u3#9QpqdUO)Z z!Z62UI;Q;&(GtjRiI&x|(u9Ya@Vn4J(eGQ5|EXH~?1xK)zcEGMV~QROF-3@-_-dwR zY&q^>spmp2VqPYP*Px7?SL@ES(Rk^n^?uFEanh2@IQ~}4Zv-FWyaN_&oLj}0IW^i$vNn_5 zFx_r!#_&&vo3vVi1#hpCVMUNwjJVW-W6wyuQAY2u;NA#Y9>2Yy0;Bo2niu~UG*GVp zS)BbtrE@P_B0Ng}J|N>rEsN|{Ld>&>-_@~k4x?%{kW2VO3pT3O24#dVTd+4rCjU3o z5*~`*1=MKmRBa}^90(xh1>jnU!yCY9sFhj(oTxdjm_kRJLKT?xN5o0^aX^hSr)e|U zO#mN7Pu8*ZRQYg%aG?boKaoXnlkm$HJol7LUI~e`_BPYn>87=R)V7w_55GmI8EYS> z3AX;aowhtiv&il~lihey6PXDOw3^$5ou;rxxJ08BY zW+>zmeon`d>nHU{i`}?u z!+0pNj!uMKm?jB^~v#kTT|9{^+C=Hn%p~RECK)fs)v6LSvzs~ z3H&?NULFnpU8rq?tU4SHfxk{|QCJa_?^gf9GoWWTTBm{g100H==L5BcuLu8!IMjiA zkLppvUGVcBbWH&FN9dCYJv0=6`(qqRpofNPaPP%o1@!Ed@%5iy zp&tA+;BFdmz}?`WuthLozj}e z+mBiT^!QQB1pi?iy1{(}jdP&qi24YB0CJD2^-zH-UkCo9Sh1ndgM*Ur zJWOa-v-uuyH>0%({4`WS4-KV|bqt40aMNH1KMrbsydr#;2SId;nu4{+YC(iWpy4X` OX~4=#W7ctX-* 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 VMm4zP4K)tasks.size(); } - -Task Plan::select_task_index(int index) { +Task Plan::select_task_index(int index) +// returns a task from its parent Plan by index +{ return this->tasks[index]; } Task Plan::select_task( std::string provided_name ) -{ /* * returns a task from a Plan object by name * this will need reworked. maybe should return int, populate a pointer. * error handling is the concern here. */ - { +{ Task * returnable; bool foundMatch = false; @@ -63,14 +64,13 @@ Task Plan::select_task( std::string provided_name ) } return * returnable; - } } Plan::Plan( std::string filename ): JLoader( filename ) -{ /* Plan loads a file and deserializes the Unit JSON object to Task types as a vector member * Plan { vector } */ +{ Json::Value raw_tasks = this->get_root()["plan"]; for ( int index = 0; index < raw_tasks.size(); index++ )