From a8b3d7692dea46e058b383e41659bb7afc0dae3c Mon Sep 17 00:00:00 2001 From: Marc Michalsky Date: Tue, 14 Apr 2020 10:58:01 +0200 Subject: [PATCH] =?UTF-8?q?Routen2.java=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/Routen2.java | 157 ------------------ .../frachtfluege/gfn/marc/Frachtfluege.class | Bin 567 -> 2419 bytes .../frachtfluege/gfn/marc/Ort.class | Bin 4216 -> 3470 bytes .../frachtfluege/gfn/marc/Routen.class | Bin 1727 -> 2163 bytes 4 files changed, 157 deletions(-) delete mode 100644 .idea/Routen2.java diff --git a/.idea/Routen2.java b/.idea/Routen2.java deleted file mode 100644 index 42e2e64..0000000 --- a/.idea/Routen2.java +++ /dev/null @@ -1,157 +0,0 @@ -package gfn.marc; - -// Hilfsklasse zur Simulation der Aufgabenstellung - -import java.util.ArrayList; -import java.util.HashMap; - -public class Routen { - - static Ort a = new Ort("A", 1600, 5.6); - static Ort b = new Ort("B", 1800, 5.2); - static Ort c = new Ort("C", 1300, 5.5); - static Ort d = new Ort("D", 1450, 4.9); - static Ort e = new Ort("E", 1400, 5.1); - - static { - a.setKnoten(b, c, d); - b.setKnoten(a, c, e); - c.setKnoten(a, b); - d.setKnoten(a, e); - e.setKnoten(b, d); - - a.berechneRouten(); - b.berechneRouten(); - c.berechneRouten(); - d.berechneRouten(); - e.berechneRouten(); - } - - public static String[][] getRoute(String SB, String SE) { - for (Ort ort : Ort.orte) { - if (ort.id.matches(SB)) { - return ort.routen.get(SB.concat(SE)); - } - } - return null; - } - -} - -class Ort { - static ArrayList orte = new ArrayList<>(); - static HashMap orteMap = new HashMap<>(); - String id; - int frachtkapazitaet; - double frachtkosten; // EUR/kg - ArrayList knoten; - HashMap knotenMap; - HashMap routen; - - public Ort(String id, int frachtkapazitaet, double frachtkosten) { - this.id = id; - this.frachtkapazitaet = frachtkapazitaet; - this.frachtkosten = frachtkosten; - Ort.orte.add(this); - Ort.orteMap.put(this.id, this); - } - - public void setKnoten(Ort... knotenArray) { - ArrayList knoten = new ArrayList<>(); - HashMap knotenMap = new HashMap<>(); - for (Ort k : knotenArray) { - knoten.add(k); - knotenMap.put(k.id, k); - } - this.knoten = knoten; - this.knotenMap = knotenMap; - } - - void berechneRouten() { - HashMap routen = new HashMap<>(); - Ort start = this; - for (Ort ziel : orte) { - if (!start.id.equals(ziel.id)) { - routen.put(start.id.concat(ziel.id), new String[orte.size()][orte.size() + 1]); - String[][] tabelle = routen.get(start.id.concat(ziel.id)); - for (int i = 0; i < tabelle.length; i++) { - tabelle[i][0] = start.id; - } - - - int i = 0; - int j = 1; - for (int k = 0; k < start.knoten.size(); k++) { - Ort startKnoten = start.knoten.get(k); - if (startKnoten.id.equals(ziel.id)) { - tabelle[i][j] = ziel.id; - i++; - } else if (startKnoten.knoten.contains(ziel)) { - tabelle[i][j] = startKnoten.id; - tabelle[i][j + 1] = ziel.id; - i++; - } else { - startKnoten = startKnoten.knoten - for (Ort folgeKnoten1 : startKnoten.knoten) { - if (folgeKnoten1.knoten.contains(ziel)) { - if (folgeKnoten1.id.equals(startKnoten.id)) continue; - if (folgeKnoten1.id.equals(start.id)) continue; - tabelle[i][j] = startKnoten.id; - tabelle[i][j + 1] = folgeKnoten1.id; - tabelle[i][j + 2] = ziel.id; - i++; - } else { - for (Ort folgeKnoten2 : folgeKnoten1.knoten) { - if (folgeKnoten2.knoten.contains(ziel)) { - if (folgeKnoten2.id.equals(folgeKnoten1.id) || - folgeKnoten2.id.equals(startKnoten.id) || - folgeKnoten2.id.equals(start.id) || - folgeKnoten1.id.equals(startKnoten.id) || - folgeKnoten1.id.equals(start.id)) continue; - tabelle[i][j] = startKnoten.id; - tabelle[i][j + 1] = folgeKnoten1.id; - tabelle[i][j + 2] = folgeKnoten2.id; - tabelle[i][j + 3] = ziel.id; - i++; - } else { - for (Ort folgeKnoten3 : folgeKnoten2.knoten) { - if (folgeKnoten3.knoten.contains(ziel)) { - if (folgeKnoten3.id.equals(folgeKnoten2.id) || - folgeKnoten3.id.equals(folgeKnoten1.id) || - folgeKnoten3.id.equals(startKnoten.id) || - folgeKnoten3.id.equals(start.id) || - folgeKnoten2.id.equals(folgeKnoten1.id) || - folgeKnoten2.id.equals(startKnoten.id) || - folgeKnoten2.id.equals(start.id) || - folgeKnoten1.id.equals(startKnoten.id) || - folgeKnoten1.id.equals(start.id)) continue; - tabelle[i][j] = startKnoten.id; - tabelle[i][j + 1] = folgeKnoten1.id; - tabelle[i][j + 2] = folgeKnoten2.id; - tabelle[i][j + 3] = folgeKnoten3.id; - tabelle[i][j + 4] = ziel.id; - i++; - } - } - } - } - } - } - } - } - /*System.out.println("-----------------------------------"); - System.out.println("Route: " + start.id.concat(ziel.id)); - for (int x = 0; x < tabelle.length; x++) { - for (int y = 0; y < tabelle[x].length; y++) { - if (tabelle[x][y] != null) { - System.out.print(tabelle[x][y] + " "); - } - } - System.out.println(); */ - } - } - this.routen = routen; - } -} - - diff --git a/out/production/frachtfluege/gfn/marc/Frachtfluege.class b/out/production/frachtfluege/gfn/marc/Frachtfluege.class index ee27b296740bd4eec8c1d5d0ae81a533b370abbc..2afacb55e0bc706c1cd24c31eed5c86a07067999 100644 GIT binary patch literal 2419 zcma)7O>9(E6#nk~y_w;awlf`|(7^&N?Xt7TiCCp^80m~k>NO35>pVcJ>S(zW^iAesc~26cM2I;efEVQj)?1zS`!W2->4 z#%lup1qnjb&I+tk7%>eq-=CNWv6vPWacmb*Y;8&}7MX6-(5=HqUDX zeW+ySH2Z>K&(bQ}nrW8>cGn8C9!#d*rlMUEt~ePMO$8kSjce?Wnl_oVyw_G&SHtK+ zw}KuO&!bnM{t4+06{bLBwp7$5Rk?zGTz}hOCj>fbB(px3#Hd7nLB$@V*p@1wGnQ_! zre}m14jlc3son!QO$&&lK^)+4OrrOx=*NISFt6LLCiLK6_Tyu{raEwrZ{R6K-BJNaCi>8huYpun2>{QTl0C zo6~?p$HyKZPN~XEiXIG2@o-zv%b38jP(wKI|q0DI~ z_dJu#A+R93;>?Drm;9nm@fmprwA_9PuKVTbyQ1K%f~9@>w~3|UA8T4VNADYOVj2004{~0VM;+xo{DLKwzZlJ^Kz-6Co82@ z4$6p@vrE=hfg9D0cO5IBCp2@qsF&L^rBY#Wp?^I`RVz=uc<$Kd~NS zNGlezhOP68nIXrbRX`mzP2CzQYUQ$CR>1DJudA(A$_fes+yCE{9jw$x(t^Bt0d_*( zK(u_cc?t7*h_fU|!O`FKHN=-RJUGm!+?LNHe5w@(yo95ig)oRAuE>|~!Am$`q|x6r zuDiQY!cdpLdz+geh~OK5kDct1nl^=Gc%#x5D%>qOtp zC_p{28)!v&mp3u_7&>^P9i)APm+>*QIN5d4D~cWrbHyuj;ootNKIVCXYk~-eFiOjV zlU!HfT|ra`(f$W%2+9vkr5aCxvmlw;#2lBu31^%^8LO1SLVk#JrhVSDKj!C7Jhkkb zUP9I}WBycMz_omrQhmyreIH$G{+}S;9B5YVAQAH|L3Qo4uR9*|oxbiT6`%bFf4nw+ zcf5D&r$|{haR>gU!*{9)drvZuHywxtdRSRoPb{z}apPme zq_OeCkDyB9WGs;OUk@;?2QmK_>Ea3n?XCJ>qAAaKc17iG2Z9U|hkEpHRF)VyICPEkybr=#+ zc2DZ?eMU=Dg)bvRWe(y+jL}l4q}OqZ{q+<5h`YOlz3%Qc=2F>h!M8X~KdGu8UA_Fq ze5G;%vhR*w07cZ}49-#&8$}S~$Wl2E`QbW;^JL%=E1GbkNj2?OIhRD9i{yRAM6}HKa~7sGi#Zh0{12ICIcxv` delta 309 zcmZvXJx;?w6okJuHvYj7a1!$qAmjjOYoJ01M3D;0RIA7_pkRb?au4JSa0Mz5LL7kW z&?DX&iHc_4%$ql(-LK@ujXuBMK7a%E9wWUU5Gd41KqTWdB4*iVC8ouyqLohyeQV0G zzPOuJSy5NcdCwQ(u}XF$#j$f)Zd+uw6fS>AWL5t6+hyVBBzzlyy-d8*JKJ;m4A-9bw`p k;VVnSXAuszAZiTxwlG_g{vNVLPgEcU+w2G`cAHH92i0scSO5S3 diff --git a/out/production/frachtfluege/gfn/marc/Ort.class b/out/production/frachtfluege/gfn/marc/Ort.class index a7047a20b647c10335db2d09115df294925aaebe..65c59105fdbfcafdbde89016d547e29afafcc020 100644 GIT binary patch delta 1000 zcmYk4S!h*P6o$XO_q{nM*F+h)@q)H+248$~fOjUA#`W21?2ipE?UqekNphgf5K zlQd4XgwpdMinfqer3DeO6%-8irJ_%Q2)^`51P6Q*9MHu7o~X!yeb(ClTK^jM|17^d z5xdcMxfhs4>-ku*%kWv6#j*<}k^ROr2LDE@f<(q=h2-O773S+3&Ik<4tEiS1|1@22`Mqs(}sVag>+3|H}sBa{Eei$`=^r0lqxcOfrU;8Jde zpXE9&ru7;b7Y|7#5oNhNvCTKZ`)d8{*&X*6Z5 zH;dU|>NH<7O=cgPOef8zhb`tDTg`R0nLBJZ_h~Ut*&)&FwAt*kqu6aH(Q1p?W9P8f z*3)L2*=G;(ojuC;_B1Jbk#_qZ9riYz_8vdjCn>t@EB3n>2V9(kZUTqgOb)xb{OIQM zldGWHRr0f|;ulxL30Kca*Tk=`MfM(gTpPc;cK!$-x{GYK5@(b4pP}*(w2LG|Opp1C zW?9)L&rW5FtU;W$rxcqcmFbp~FKy&#nVVe}+oXypN9^MP8oKR6whQ$b>#Au{ij?U( z-e|~o-@Z|N%(b#Zs3onXEQw(NtCf{jP#Yuq7#hk(5}MJ+>QGC;Z$m1^SQGD8(MWhB iU8MuyMX1M}1HuY&bH>Hf%8%(5KGDBO%)4Y;cE1L6?5D8+ delta 1730 zcmai!S!`5Q7{`C-p3dBvaexL=a6qADEn9{ZEYOMwRTgc7ZP^4V9owNDIvX>$8%qaj zSp-_pQK-0+C{aTUqBRmBB*rEZA9&Ej7ax2uQJ+mjg4XZefdQk&ndIE>od37{zvY~P zNjHjp*Z#b81z5`47km{uvyn|EoBce^7DeICP)8^j4aHl6_1$SJ98>5-yQL_qc92LS z_*5zqx9Y7_I25b&@Qh;G{Qv*?XkfcZqn{AZD#qP)mdSflm`U4rG%n#vbMbOaEIDqe zoV{_Z&~Ek8MEYudRO2nH&)~1NnDpJ}C#jW&M6wP+HRzDFtmdkN!pS0Q0-CjJz z{KT26aHkR%YjuxO`?A*y>fEYZp}MlguBwcbVr3#>rL9ybSrfKe6V2%{ZeH|}N&zzhK8P_Q zoJ|vt$$pcGCeuYw3T_BLIDp&c4DM24PzZWBd%_G%dT;(`R4T6GsVJEDF=n7ZmLZm( z(Z?@-VV3C3M{F3ob%<^9y$65n5=|h-y4+Lb3AnDDWrZ&H7I_1%B2Ss@W;sHUw``d4 zVtQwHi5<3COP^Pr8~H|nA$In8M816P*7`YfKOuTS$QB@FRa04mB)3YkUX4#SGgvDf zdV)i-n*KtJGaa3>MnBK;5ZPBkY3}kdaC-fjE^#=^-3uN`D0$k>lzRGF+C4dE*@piR9J21UW1gUfn5GJ|dEbsIKLC zsjEw9l!?D};!pwyIV!Np454yNjO9Y;;oGC@(N}I?G@t&Q3Y?*pah1_6hnvov_vhv{yKdCXW%eEO$tiMkd~zGLblQFm bPH{r3CaM*v6gWYZgRm>wuN ztWr40;4W7TeOg=L*rc+(&A_|9GLSUjiO+{L;83hqnXwNe)8=P5GkrT{TkC<>Bg939*O+a$+< z8fi`gZd@a++6h?4b&5Q=ft!Tz#~YAfeRYOe&1#o>OrE@tpuOn9E$SsvJOYz2E+e>2 z9>X2-RYbWSGFk`i=YyK) zvY+m@>}$64;65HS8^qxhS-q_d!mSO$nOFan9};)4tM~3!?`>9B@KD^#q?51+xm>p2 zLrHd?^3h*{(_5H&jhH~r`P_;h=LM1!$R(fb_v5laQUb~NTSB>@63!HM=5lhwK73r+yTB&&7Ss_LaMii!MYj z`Cv|G`Yu+JpXU2wSQRirn#zZpo!;6~XJfh3UGFDFs}#?}pb3kkG|x^dpSseKuDq=) zudtdBRNKrC`8v%iSgjMg5Zi1FJYrTf;NUT{n+os*YkXy~j;BP_@D`UPdsaPGBNN;T z9L6M$U>Z|6gQJ+iF}-4n!bu#&GdeJ-n!|G{RLo(6oxltBF3jI>9QY@H(T2p!kxOxz zor?X>kgdWwkKYfoyEy+5fkNU!-E*XmOB!lu(N)j#eJp9DsgawW_0Gq#Mk0;0JnM~* zyBcW^5ZGV1%p9N*wlV`W!wp%EAS!?jbc8C%1_lx(DM^glWjw?}AtWVk-q s!3vM)+|)VJxy`KpiqL