From 63c66ca33fc5168d82270693397825c957ca3731 Mon Sep 17 00:00:00 2001 From: Joel Baldauf Date: Thu, 10 Dec 2020 16:59:46 +0100 Subject: [PATCH] fixed wiso 40/60 calc --- Punkte-in-Noten/src/frame.java | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Punkte-in-Noten/src/frame.java b/Punkte-in-Noten/src/frame.java index 2d01e36..d4f3946 100644 --- a/Punkte-in-Noten/src/frame.java +++ b/Punkte-in-Noten/src/frame.java @@ -92,19 +92,21 @@ public class frame extends JFrame { } - public String[] calculatePart(int pointsA, int pointsB, int maxPointsA, int maxPointsB, boolean mitIHK) { - double percentagePartA = (0.5*(double)pointsA/(double)maxPointsA)*(double)100; - double percentagePartB = (0.5*(double)pointsB/(double)maxPointsB)*(double)100; + public String[] calculatePart(int pointsA, int pointsB, int maxPointsA, int maxPointsB, int percentageA, int percentageB, boolean mitIHK) { + double calcPercentageA = (double)percentageA/(double)100; + double calcPercentageB = (double)percentageB/(double)100; + double percentagePartA = (calcPercentageA*(double)pointsA/(double)maxPointsA)*(double)100; + double percentagePartB = (calcPercentageB*(double)pointsB/(double)maxPointsB)*(double)100; double totalPercentage = percentagePartA + percentagePartB; double markIHK = marksIHK[(int)totalPercentage]; - String[] resWiso = new String[6]; - resWiso[0] = String.format("%.2f", percentagePartA); - resWiso[1] = String.format("%.2f", percentagePartB); - resWiso[2] = String.format("%.2f", totalPercentage); - resWiso[3] = String.format("%.0f", totalPercentage); - resWiso[4] = String.format("%.2f", markIHK); - resWiso[5] = String.format("%.0f", markIHK); - return resWiso; + String[] res = new String[6]; + res[0] = String.format("%.2f", percentagePartA); + res[1] = String.format("%.2f", percentagePartB); + res[2] = String.format("%.2f", totalPercentage); + res[3] = String.format("%.0f", totalPercentage); + res[4] = String.format("%.2f", markIHK); + res[5] = String.format("%.0f", markIHK); + return res; } /** * Create the frame. @@ -288,7 +290,7 @@ public class frame extends JFrame { Button btnCalcAP1 = new Button("Berechnen"); btnCalcAP1.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - String[] resWiso = calculatePart((int)spAP1_PartA.getValue(), (int)spAP1_PartB.getValue(), pointsAP1PartA, pointsAP1PartB, true); + String[] resWiso = calculatePart((int)spAP1_PartA.getValue(), (int)spAP1_PartB.getValue(), pointsAP1PartA, pointsAP1PartB, 50, 50, true); JTextPane txtpnGesamt = new JTextPane(); txtpnGesamt.setText("AP1 \n\nAnzahl der richtig gelösten gebundenen Aufgaben " + spAP1_PartA.getValue() + ": 0,5 = " + resWiso[0] + "\n" + "Erreichte Punkte bei den ungebundenen Aufgaben " + spAP1_PartB.getValue() + ": 1,6 =" + resWiso[1] + "\n" @@ -306,9 +308,9 @@ public class frame extends JFrame { Button btnCalcAP2 = new Button("Berechnen"); btnCalcAP2.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - String[] resSE = calculatePart((int)spAP2_SE_PartA.getValue(), (int)spAP2_SE_PartB.getValue(), pointsAP2_SEPartA, pointsAP2_SEPartB, false); - String[] resFus = calculatePart((int)spAP2_Fus_PartA.getValue(), (int)spAP2_Fus_PartB.getValue(), pointsAP2_FusPartA, pointsAP2_FusPartB, false); - String[] resWiso = calculatePart((int)spAP2_Wiso_PartA.getValue(), (int)spAP2_Wiso_PartB.getValue(), pointsAP2_WisoPartA, pointsAP2_WisoPartB, false); + String[] resSE = calculatePart((int)spAP2_SE_PartA.getValue(), (int)spAP2_SE_PartB.getValue(), pointsAP2_SEPartA, pointsAP2_SEPartB, 50, 50, false); + String[] resFus = calculatePart((int)spAP2_Fus_PartA.getValue(), (int)spAP2_Fus_PartB.getValue(), pointsAP2_FusPartA, pointsAP2_FusPartB, 50, 50, false); + String[] resWiso = calculatePart((int)spAP2_Wiso_PartA.getValue(), (int)spAP2_Wiso_PartB.getValue(), pointsAP2_WisoPartA, pointsAP2_WisoPartB, 40, 60, false); String textSE = "AP2\n\nSystementwurf\n=============\n" + "Anzahl der richtig gelösten gebundenen Aufgaben " + spAP2_SE_PartA.getValue() + ": 0,5 = " + resSE[0] + "\n" + "Erreichte Punkte bei den ungebundenen Aufgaben " + spAP2_SE_PartB.getValue() + ": 1,6 =" + resSE[1] + "\n"