From a2a29a246cb15a957f745c56bcc66e26b7214f9c Mon Sep 17 00:00:00 2001 From: Tony Date: Wed, 9 Dec 2015 13:40:22 -0500 Subject: [PATCH] Enabled Parallelization code and commented out non-parallel code and fixed a few typos --- .../resource/DiscreteResourceDomain.class | Bin 7827 -> 8633 bytes .../js/spi/graph/arc/ForwardCheckArc.class | Bin 2957 -> 3339 bytes .../spi/graph/arc/ForwardCheckReflexArc.class | Bin 3024 -> 3406 bytes .../jopt/js/spi/variable/JsVarFactory.class | Bin 2875 -> 3139 bytes .../resource/DiscreteResourceDomain.java | 8 ++++---- .../js/spi/graph/arc/ForwardCheckArc.java | 10 +++++----- .../spi/graph/arc/ForwardCheckReflexArc.java | 10 +++++----- .../jopt/js/spi/variable/JsVarFactory.java | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jOptJSRecover/bin/jopt/js/spi/domain/resource/DiscreteResourceDomain.class b/jOptJSRecover/bin/jopt/js/spi/domain/resource/DiscreteResourceDomain.class index dd310b912ff423304bb68971e3fd8b37328c9c7f..7b0f94200abefd97e1f640456ddcc9d26bd8f90b 100644 GIT binary patch delta 2181 zcmb7EX>e0j6#h5ZTZZs1SdPsB5xztrY;#xB^D()oG`Y! zIk7Ad$^5r^l>~1y@B4gq$%Qv*mWacA+!xjmP4X5vZ`EWOHF!nA0gPuYvDB1>t?Aok z5MEXA8o0AXO=6U)j>{vZ?{Q2Nd6MoQ z@sktB38iAJbFiqEJvj<~#tE^{vtsb?<{4`>MgE~+A7V0caauteWEuBkt+-QZuu+ca zRYuszEo8OeQt}W&Hw{#_qBt2{SRaeCh6HF`D0KF`RN44-89B_kji!ES7rqq}sso}+stEmv1{ zZx=RJgu0R0Jf{m!R%p7WhqBl*TQb6(D9}|cJX-U0z-uAHr-hBck}zpuO=<7{!XgdV zy(Y=ufqV-Ye$A)(8#Q|eoJY;3KXD_g>yU6j6r;mOf-{`%|f#nNft5~*^y6oV*wn< z!6>>7f_)B5q8ZrE$cb5W6?Pztj0<&Spo^g!%X!C7^RjH!;~5NvhpTcDJK3k89ao@) zk;+^R-Hg0A!uVO{sp!KN>|*4_QEbF+Ud`nicj7rlJ{;%DKF`RH6P#xcqX6e!g%>gm zxm;L^7x5B8l#jddGWJ5F5>94*E=<>={4ByS-hK*x&I;5{gY67j=?O8Xa#R@TE`${QwG^i!5`on?-Q5nZNdEy z!ByIY>P@9t9JJ3X-HzAAF1<$T!CN9Xa=H7U>B*vMt!R&EqCPSr?`@3dUU^vgRGwJ} zJj{7Vtd2~O_$3m(k|%RC78b}c zK^9>%<6?(tbm7#ra?_Ij=KP!d=MtgRG?p!72aqghsM*NIa9oDZSdhh-1?gjPd}MLgKnnY6_^lig>j?Beil{Wc6EoRmR^|eN{)c)M z;q&B+2a2jqsh<^HW+S`E8#Mf8^GO}hcQvas8uc+F&%PFH^qt>xUT#nm@Lx%0$$-9`Tzg` delta 1518 zcmb7EZBSHI7=F&(%YNK@c9*X!Z0y1!q_&tiX=_6`4a4M&4UH%xGxVd}U}I2N6&9$* z31{M0(=X3BgUwLE5SUSh$|XR>%AlYR64MOJ0`db&EBg@TqxUW}P5o%5xqI*XydUSB z=Y7sO+np=cD}!@ACjqQstV7AOCe|^SN`qkqjcDa)gO5S3Dtk64PTNZTrkX%GgS{#o zs09;BkW+BL*C}H>3FRf&Pdh~$zF9u(Y!{b zjy-;7#4|EF_WGkWr@I+u_x*mS7VRPAp%4X2G`R&9jr)~)m1(NWO0zc2muN~mohTDr z^gTo>PPjJJoxwhgpaEymMB*R9d32E8ow$H*jN&*hqL1t_X+45VI7jw6z9T`#n1XQ@ zjR_Wq%glu<%#BI53{%WU`@4=kfV*gw_63cQ1UGr47Pcdq_Q^n72}yMkSV+(mL4HCq z64_GhfEiJ^m)RjGW=0OCagdM&g_ywWMAeEXh}s*3Y}CX-S}Yj~_M;hTgj9;}#hZkT z6JCwC2-&Hr-8f9hK`pGp+t`o{Cw1bbu9FdsbRzi(qWLUVS|~AtI5vxT3mWOST%LuM zu{oqM#-unYVHW9(S?6h1E>hibR%%P4=ZGkB*Tfxt307Yh^4fhmba|Wa7`nxndz0xn zPKdRhwNZK`QsK#AC&gipCiNWqQc&M5TvRk;rcGWpv>K8qs$E@ni=2 zVeiFIQS2vO_^dBuV9`5cc)ko;@oXmsd`6)~$5)-G&FF{flRMGZMyyO^#Z$@o+PAcm zbk%49Gh~n5E0Z@ShLY2s9H+6ha*~b+h%$hVCB}@kX2a>i_m8eLJkwt_|1Q2#&sdUC zq2pT9eCr}=gd;L4c2eZ0Y<6RcR+b_RI7~B$Vt26lHd2Vk58_11Itf3LSt=5}nuO~j z)0#PBCCc%T>n diff --git a/jOptJSRecover/bin/jopt/js/spi/graph/arc/ForwardCheckArc.class b/jOptJSRecover/bin/jopt/js/spi/graph/arc/ForwardCheckArc.class index 48772e65f3d0d9c3a34b2f2674db11242d8ff578..5ad50813c566904965e818f60bfbb2852e0e03e6 100644 GIT binary patch delta 1559 zcmaJ>T~8ck6n@^FnH`wEP;|RRx+T~U?Cy%72-Nabpg^H~6fT!{9ZS7YURPh)?&CQCc%G6XgZ8{q25alRCjA1G|G&Jk}tkg-f{+*AV zRq;5(k!5{dZ_GJnx-n^Gk~!NpGEU=wWv5PCX6B4#r8UIykT@DR8u27U(9En`DTCoy zbmW2634JZq9`ke3dSw57m@SIeIcRs%I1WLfTN#>t14q zZhpYsj{;u>hdD+t>h?*4@+8NU`=QjtrrqzPrjj1aa6FG$_b;hGc%I`0%(;W|De~(a z3*`Sqt`078805br*N}gS<0Y8xFLEs3gA_*^D-0phGHI;lOxswTG}f$~oupyP(V^Io zMw%^-L6G$bRyk}OW>BdhaUpAH=z+tL6TSoF>(}kHX{Tg@F<~C{qpxthDx&2S?aSG^V_KO}Gb6ga#_>Ax?xym&{5D6zoea9A^-vL{729xs z3!doPLEVfL{~F=ldU4WIyN#o5@($uN+o*3-s+20ZfG4Ko;(BTewejjLwA>~D3CHMc zL%Dldt<4|DG}-fLr|EQH75!Mp0G^?YL25|taGc`eZvzSuV4kI-1Od<52Tq6w5FrE( znb003oKCXlQHd^`psH@l3?p!t9Eu92qDRF^Mo1Nq82a4KlB&Gmsay%4|;RDS17>82$a$P zIFa)ejZuzJ6e2|vKR}Di-)LKy5O4SENfWCT0?F=S6(Ux7@r}Cak-*9cEP;m!^jUI< zVVxC&W4$zBu|c<_jxW(GRwmL!XA3=|v$(^Nh60`|;2hci6P+(0d4;iv$lm?p?hf5l zJ&u+FUi=g%{a5j}+!2p#BQsiGK=w1lMWBGSF8^L{m3`wvt0FeIr8+E!l>#mnH`M)D zYtR3?g|~`>4`A5aGlnHJ7bm%b23*2rl6w&~c*EPrt2l@^y?uP2esr&pkk@<7}C}IheVsp$OkC#LMPr5Z2WJkdERR@&g*-=t5W1e`FID{sFqP&)ZF+716M08 delta 1273 zcmZ`%U2jxX6kTWTJ@>ZbX(FHlTJqEB5XMMyJQuer$y4U$g>3S%+yblewV~71+Z=-*w!7lo{ zy*6);!AJBT@Yd2_G#JHRd%@d4;}e5@_|!h|)~z2i=tMq_7xB5l0jyE*C(4!L*|~BY zS(FS8*(ER8m&IX&vV@x$-chQQPgaIz4;LqAqPz)%BNA+6aPZWLQf2bk?8xM-z)l$) z#k3vuue%k4E%p!J))(Ny<904uTi083^6nx!oxEN|D*YpZz|Cd?oeR-&11srh4_vVe zi)dKTD$tq7H=q5w;HtotY#L9}ZTFG7M?eR!@w*i(ZF7D5d>TV|gS*LK3~yqB^GwmM zAdT~kTwvbo%pQg>RIq`5`CWu2IThV})FBq#UVtI`Y9xtZNWUMwwc9Z9GxTZp0A4}e zGqgbaP^~_)KHgS@YFhIrw0b$V1TRMDckILZm*$0PwbAy7h>4oUYD5%rRFA?6X6|+lSC@upHYM{c#_!XH+=SXhJY>1%{AN+rGB*g9orIO4Lxjn2_??Ng>;d=~JO|d@iPA4DW zvyn`Q{XZZrfe;5}DxTwc(JL=scm6xOTPKH2<$4uhkYGqku(niURJa zZE}WEp1~}~{R(Swj8O+)qnRrbXDdL eruwFFp1>s{US9UDy2gw7IEB;1R5%mWeEBy7p~koX diff --git a/jOptJSRecover/bin/jopt/js/spi/graph/arc/ForwardCheckReflexArc.class b/jOptJSRecover/bin/jopt/js/spi/graph/arc/ForwardCheckReflexArc.class index 9e44aaa4c4b0bd7c11f7df15c914ca623413684f..e870ec2e253c4a457770f305a8531a39f40dd8c9 100644 GIT binary patch delta 1611 zcmaJ>T~ixn6n@_9ZZ-)E#fB8pz*J4aBw(Ypd=y%sDIZM=g#zWn*1{52x+G*n*re8v z#*b=yi|dUS9d*2LbeyprC7lsvywcGbozD0d^w#m(QSrQ+Ffd+pXZGE*=REIoo^#H- z`>_6(!=9i1{dya~bGUQg^9OUvXkj?AQR_dHn#`tk(}QM&6jUS3Fd2%+H@;|bT;^*r zJT0S@;fWQsphokio{lDsOfsL#X&Ey*WaLr_L(hyGM%sf29^=a~1yMZ1;M6k(Bc(BP zhDIK_drDnT^@Piqw3=CtjxDZeNwbHG3LIBR^a+OQWzC#lRrSn#LCvi*ghFAGC%M7U zVg1AO+NyOUpG#`&*L(K zmui^M*7ABzTbj_ydKtt}JRIkHUQlqA!)ge2R?VtO-MlfXXLx8qfr>_kItmS{xwNjW zn8rMpTo+gPA2ec$A_qDp=-G&ODIMsitmZY~}{&3RaM^J`j6d zF{~=cz_5N7yPRtZa#**5Qjq+41qEEUE=Zq=Z!v_eH7QI-=xv5Z>!H+W4Lg(WHpp<& z3A=86>FgWWLi3yu`3k=6R=(05e1NCA#VthU9-ysT@=JcPgr{dB{PFB2f{~_8wBIKJ z0iCpVqsAJNgT+qFpbHB)iEHFrLq7>QLmuE9C8Tr|>82;QXhd`xxFwMkhiz3sA;vlc z&_k9;Y>(pFMe!LdUQNd}W~Mn;SgQ!V-!2GB^X2ME(fPtNah#{-j#cKd+NCj}7G>(vtv3>ZO3cjD>0vIP5#t^MM@dH{S zd{Eopcs7v`PJM!E?hXiJw-^i9k&kx%bdLRD1w^=LUIb0<7m0s>FVZK8w8;c!M+0Z(it>2-6UfO-4 zPiiXRTDQzY+|%fnOGuZ2|KG~vcD}A%bP2PZs)YIv5!@qf@<~2t3E2+UF3{&H!K^gm z-Kyat@57aHC6zug)qV5!MlPo7R t`cV||I-Qj*`rp4nK9@bH1~`uH;A8%qqfg*X#xEJS01u^kha@;~`#;-hJbeHF delta 1281 zcmY*ZOH30{6g{sqZ)RE^sFbl_@ms4>kSb_Fw15hT3ZfQ2D1Itbtsg|KMmJUsQRBv# zw{qc!xFEWcM7!`qT=`2hu666ijWKa&jCkKTNNv*Tx%ZuS?wxbr>xUU11HN~^pN;{j z#hFpxH^#kSSRk9VbdVikC`@FMeMdW!gWbsk$5JLN6H6FEH%9|9uHVq>1y;z9dJT(9 zjW08r1RBsRm`!Szrsw8Kx4eBbiB^&a@8ncc+i16fYsrtrnF;%b8QjO!~xtBTPMu_qU1p3e~e;5zhpuA&Nvs3cDdD)wQ4uj0N zDtB5<-C9f^!E!CeM-YxYhHdNBl{T-*A#e}VC=s%C6(>eeIK-LFE60Y%KMm>3))kwA z*O8e|5FRB#4GZbnhH3J%70Oni6%q2F61}LxAuPrbiZiIdB{bs-R$~#d+hM9!C>x<) zg~)%JjzXN;^f;&hg49b8BsD?puR)WG+DW^La-8&mIk3hN05`#An5Z@pWh6DV{1-Tz z<@pK2L()s-MQ>S1wQ4wp+MGs&gFS8|3^k~g&%L3n;uTSG(5sl}pi*6V{34gHifdp> zWEq_@hAEWTOr5GXvB@d_D@@T}Aljp;An}Mja&}CrZzJ{X@S`VB-A0Aq@x_(*liYH| z(H(4c%3&JIhdGcS}vCEAG!IhKJVOQFNd3n;7lIE;f z&46yuf5O8Bb~c>D>RTwIj{WqdsI~GXO6efpg+A)S_~h#PMul_eh^doEpex4zf~_$_ z(J2Vqy3J?iu&u#VODa=dX6DfIm-ye-_5bQp7xfeL$u908l&@+VIqZp96Fl3>Avxj3 z1+gxx+~|duo^M?@6iVSBy?qsK(}fV^Ks|2aFd>bu!!@J{>DYiQT@`ht6F7^bgbdo( qk7GDaXXF_QF+e%X8CNMh^T%;t{bex|Cz$$}I0^Wu%xNm_LFNxe{@tVi diff --git a/jOptJSRecover/bin/jopt/js/spi/variable/JsVarFactory.class b/jOptJSRecover/bin/jopt/js/spi/variable/JsVarFactory.class index 43296bbaea9b2bbc9544bfe707fa63b440925150..1b08110d3d0c471a942775e51d6341658ae6b166 100644 GIT binary patch delta 539 zcmZvZO)mpc6o%j1uj$+=wP~ruLIkzYN<<}{#AXmfeScO_qb9VS%x$VHZ0vmONPme) zNK|a>`~+71gdK5aNF*XRx%bJ*Ip=-PxsB*k8-M=1e*`dy{58Mv2PEhW-B&Gp42Q-nSxQhM}`$92v>OTG2`tgk3nSR!zH>bXrV` zqCF>s#W4-Vx#mMyz#>DSXdj8P$uJzx{8QceTfSr*l-0iPB+Ib(lCwJ{vrwx)_&dUi zZHj_X$y-8H7<#YXqGNxJtK|15t3+lPy8hGqm2=#xH?RJ8udIPXq3s;hU*w)d0~6Uu zFcOqvzDM8g{&tMOM|_9LwA{dS_71aY9^*0j7IUlhAs+W8pwzc{>&YonIKv1|q2U}E zTwn>8Xrk7~2sr|1MwniQTG0mPQa{?^aVbIMbtwfEK9@9#`CS?%3P47Qx~lX;Aw;oE ru^@VA;VWn#Ak;8`Rjg532EE8)oo35XIfv&1VF?>dA=yoec(C;am+F2C delta 309 zcmW;GyG{Z@6vpxY?3I}np>VmVjSW$wm}uNWOEKPs7&{AlJ1YcYZ1w?6_6e||HguY7 zV`uFv_zD&V!L!@U{LXiB&df*cy<$G6Zz-@t=hckeq~|SL>TW#qer$bk@Bm^=p6r!E^j zuuYFW`m`8uBz1=_H#}3!UScjk=PAjZ)m3V!T$?On&wOpCz2HoX>iSHM%LsTS*Y1!g)@=iT*j;Tf0TSKR4}2eCb(+B`jr92rL-;D|3;NF AKmY&$ diff --git a/jOptJSRecover/src/jopt/js/spi/domain/resource/DiscreteResourceDomain.java b/jOptJSRecover/src/jopt/js/spi/domain/resource/DiscreteResourceDomain.java index 63a9f0e..fb34336 100644 --- a/jOptJSRecover/src/jopt/js/spi/domain/resource/DiscreteResourceDomain.java +++ b/jOptJSRecover/src/jopt/js/spi/domain/resource/DiscreteResourceDomain.java @@ -207,7 +207,7 @@ public class DiscreteResourceDomain extends ResourceDomain { } } - int maxValue = 0; +/* int maxValue = 0; for (int i=0; i