From b18d2619fa6c976357af92ce45d0e19ab57ec50f Mon Sep 17 00:00:00 2001 From: albyg Date: Tue, 13 May 2025 19:45:51 +0200 Subject: [PATCH] player creation and some fixes --- .../it/arnaldo/unibs/tamagolem/Element.class | Bin 1523 -> 1568 bytes .../unibs/tamagolem/ElementGraph.class | Bin 3157 -> 3157 bytes .../arnaldo/unibs/tamagolem/ElementLink.class | Bin 805 -> 805 bytes .../it/arnaldo/unibs/tamagolem/Game.class | Bin 2722 -> 2960 bytes .../unibs/tamagolem/GraphElement.class | Bin 1844 -> 1844 bytes .../it/arnaldo/unibs/tamagolem/Player.class | Bin 845 -> 845 bytes .../arnaldo/unibs/tamagolem/TamaGolem.class | Bin 1391 -> 1391 bytes .../unibs/tamagolem/TamaGolemMain.class | Bin 1054 -> 1408 bytes .../unibs/tamagolem/WorldBuilder.class | Bin 5972 -> 5972 bytes src/Game.java | 31 ++++++++++++++---- src/LinearSystem.java | 3 ++ src/Pair.java | 1 + src/TamaGolemMain.java | 23 +++++++++++-- src/WorldBuilder.java | 9 +++-- 14 files changed, 57 insertions(+), 10 deletions(-) diff --git a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Element.class b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Element.class index 9f2bd764275091f0723fa86f9d9aead4b73e7a98..3ef3bf396e26fb210a8b241c1806f096da6b5049 100644 GIT binary patch delta 137 zcmey&y?{sH)W2Q(7#J9w8G_jvm>3z9CI%{PG`hkhDBzn~l98VhkXV$Mn_7}uRJ@sm zS%i_1X|g1XwU9SZ2P-23LjwZ?6N52>2?O)wXci+G9|ks{1W1yTiGe`?NCUAikYZx+ Yn>>pppV=Qs^RV9Fhlm9*1cK#)0FP)H&;S4c delta 93 zcmZ3$^O;-V)W2Q(7#JAr8G_gum>3z9CI%{PG`hmHS&~_Zk&$t-4vRHA6N52>2?NvQ mN){ttZw5A?Y9AnGV(^`OoF$*x4@g_G-r$Fb`7;E7(I)W2Q(7#J9wH*&}_0{}dU1-k$M delta 17 ZcmZ3=wv>(I)W2Q(7#JArH*&}_0{}dA1-AeI diff --git a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Game.class b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/Game.class index fa6a92dfe3a12c8d7ded0ed627785bc400c97080..c01d743b7f267ae69f28ab239c63fafc42a17151 100644 GIT binary patch literal 2960 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 delta 434 zcmYL_OG`pw5Qd-ccsY7Jm7TnFPczfBviogQy9gqJ+SICVA%SRtNsycR3v%{BKcOIv zjDA2rsAV*#f)?M*yfg32JKx+z?nBnc*Xuj5%~s1QrNV>=n^-mxY(=!9uXU-aFV0Ix zH&=~vt@V}~?p1`3bxrSHR?9VuDE%gm%>c31=SI*Zp_p)Yj1g;B*UBb?inIq;53Bm7 zTn{m<@So~t(;~^JO@LU4aYdjhxh0DfX_HBt3{#4n*XgE>Jv+{{$IU6~d3W0wb)Sul zyp=?p8Jhw@nQ+z6^@ho;BJZC0@@~%e;12i?Zi^W5MZ^k;px8Mp% zdSyvU8SKA!fki=KmROdI*IW^vH?;7C>GZVe>k>cdl00#SI*j}TV-mbD(P1yUUu={A lmvHb)tLfdEtXz6Vggm*#??_fy6_k}F)>s!o#fD&m&2KTuKa&6e diff --git a/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/WorldBuilder.class b/out/production/TamaGolem/it/arnaldo/unibs/tamagolem/WorldBuilder.class index 03fcd4222262fc6f8e283ebdf61a6d4dc9abbe92..0c5c0c5c8a2e3c948c59a7c28d470bbe526789eb 100644 GIT binary patch delta 373 zcmWNL%`4<_0EeH?FNKX}4qoyW*_~m%j3`sXdYwinYQ5)WbMTh8V!SM2V&Br_Fqc*K z;J`&WkT&Ju514~eEyrpL!y$h$}7}Jv#@y$8mpcfp}tggN+0- zNF*CO`6N+H8gA0@n6;ivTFGM3aMk!1atZO4pE%gX$su{1n%5QYxuJj;3T2~6DHJOW zmvShP6Nic@R|Rg>;ZZXc8lzJFGCn9om3~pJ-_+=WTK%C;x76z%uO9H}9}RkS5FBBWMk>b+Vs)r2pivPFVl| delta 373 zcmWNLxl7w|07u{FhtP-(i9w$P77M!wJ zXon8E6gnuO2pRkX9E3t#T%_Po5VTMT3MKemK92{V;l+J%pY0?WI|k|wZGRoBHd08% zK^i$cBo8|t(kUeaKbZu`B1kqN9`n&~#rURqMaXBD0=`km4_q8k#2Icbc)}eXIVe^J zPnC^V`IN{_fl4S>6%}g0uU97s>RItbHGA7f^B3?s%rGsG8$*<-}?j&Z^` z=S=X2NfNv<&2LHaPPx37iz#`TRv9z$GpknSG|Id-_@F%&6k}1p+$`yaWy{Wr selectedElements = new ArrayList<>(Arrays.asList(allElements)); Collections.shuffle(selectedElements); + + // seleziono la sublist di lunghezza numElements selectedElements = selectedElements.subList(0, numElements); @@ -46,7 +49,7 @@ public class WorldBuilder { // sistema lineare per trovare le soluzioni che verificano l'equilibrio - try{ + try { LinearSystem system = new LinearSystem(numElements, A, b); int[] solution = system.resolve(); @@ -65,7 +68,8 @@ public class WorldBuilder { world.printGraph(); return world; - }catch (Exception e){ + + }catch (Exception e){ buildWorld(); } @@ -133,6 +137,7 @@ public class WorldBuilder { } } while (!valid); + return linkDirections; } }