From f99dc5e78a1d299d9307865eba084db99f7483a5 Mon Sep 17 00:00:00 2001 From: Joel Baldauf Date: Tue, 8 Dec 2020 14:03:27 +0100 Subject: [PATCH] rename percentage -> totalPercentage --- Punkte-in-Noten/src/PunkteInNoten.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Punkte-in-Noten/src/PunkteInNoten.java b/Punkte-in-Noten/src/PunkteInNoten.java index 2f8d986..fe97bf5 100644 --- a/Punkte-in-Noten/src/PunkteInNoten.java +++ b/Punkte-in-Noten/src/PunkteInNoten.java @@ -1,14 +1,11 @@ import java.util.Scanner; - public class PunkteInNoten { // Array mit den IHK-Noten als Konstante. Das jeweilige Arrayfeld entspricht der Prozentanzahl public static final double marksIHK[] = {6.0,6.0,6.0,6.0,6.0,6.0,5.9,5.9,5.9,5.9,5.9,5.9,5.8,5.8,5.8,5.8,5.8,5.7,5.7,5.7,5.7,5.7,5.7,5.6,5.6,5.6,5.6,5.6,5.6,5.5,5.4,5.4,5.3,5.3,5.2,5.2,5.1,5.1,5.0,5.0,5.0,4.9,4.9,4.8,4.8,4.7,4.7,4.6,4.6,4.5,4.4,4.4,4.3,4.3,4.2,4.1,4.1,4.0,4.0,3.9,3.9,3.8,3.7,3.7,3.6,3.6,3.5,3.4,3.3,3.3,3.2,3.1,3.1,3.0,2.9,2.9,2.8,2.7,2.7,2.6,2.5,2.4,2.3,2.2,2.1,2.0,2.0,1.9,1.8,1.7,1.6,1.5,1.4,1.4,1.3,1.3,1.2,1.2,1.1,1.1,1.0}; - - public static void main(String[] args) { - double pointPercentage = 0; + int pointPercentage = 0; double markIHK = 0.0; // Scanner für Tastatureingaben Scanner keyboard = new Scanner (System.in); @@ -17,16 +14,16 @@ public class PunkteInNoten { System.out.print("maximale Punktanzahl: "); int maxPoints = keyboard.nextInt(); System.out.print("Wievielen Prozenten sollen die Punkte entsprechen?: "); - int percentage = keyboard.nextInt(); + int totalPercentage = keyboard.nextInt(); //For-Schleife für die Anzahl der Punkte for (int point=maxPoints; point>=0; point--) { - pointPercentage = ((double)point/(double)maxPoints)*(double)percentage; - markIHK = marksIHK[(int)pointPercentage]; - if (percentage == 100) - System.out.printf("%d Punkte %.0f%% -> IHK-Note %.1f -> ganze Note %.0f \n", point, pointPercentage, markIHK, markIHK); + pointPercentage = (int) (((double)point/(double)maxPoints)*(double)totalPercentage); + markIHK = marksIHK[pointPercentage]; + if (totalPercentage == 100) + System.out.printf("%d Punkte %d%% -> IHK-Note %.1f -> ganze Note %.0f \n", point, pointPercentage, markIHK, markIHK); else - System.out.printf("%d Punkte %.0f%%\n", point, pointPercentage); + System.out.printf("%d Punkte %d%%\n", point, pointPercentage); } }