diff --git a/build/test/out/c/funktion.o b/build/test/out/c/funktion.o index 0a80e40..d707901 100644 Binary files a/build/test/out/c/funktion.o and b/build/test/out/c/funktion.o differ diff --git a/build/test/out/test_Akkortrichtsatz.out b/build/test/out/test_Akkortrichtsatz.out index d8cba19..00c01fe 100755 Binary files a/build/test/out/test_Akkortrichtsatz.out and b/build/test/out/test_Akkortrichtsatz.out differ diff --git a/build/test/out/test_Anlagenabnutzungsgrad.out b/build/test/out/test_Anlagenabnutzungsgrad.out index 49f4229..ce297c6 100755 Binary files a/build/test/out/test_Anlagenabnutzungsgrad.out and b/build/test/out/test_Anlagenabnutzungsgrad.out differ diff --git a/build/test/out/test_Anlagenintensitaet.out b/build/test/out/test_Anlagenintensitaet.out index 19005cd..3380ef7 100755 Binary files a/build/test/out/test_Anlagenintensitaet.out and b/build/test/out/test_Anlagenintensitaet.out differ diff --git a/build/test/out/test_Anlagenproduktivitaet.out b/build/test/out/test_Anlagenproduktivitaet.out index df5aeab..d66f23f 100755 Binary files a/build/test/out/test_Anlagenproduktivitaet.out and b/build/test/out/test_Anlagenproduktivitaet.out differ diff --git a/build/test/out/test_Arbeitsproduktivitaet.out b/build/test/out/test_Arbeitsproduktivitaet.out index 7396ce9..6f9f12b 100755 Binary files a/build/test/out/test_Arbeitsproduktivitaet.out and b/build/test/out/test_Arbeitsproduktivitaet.out differ diff --git a/build/test/out/test_Cashflow_zu_Gesamtkapital.out b/build/test/out/test_Cashflow_zu_Gesamtkapital.out index a4416be..808c81a 100755 Binary files a/build/test/out/test_Cashflow_zu_Gesamtkapital.out and b/build/test/out/test_Cashflow_zu_Gesamtkapital.out differ diff --git a/build/test/out/test_Dynamische_Amortisationszeit.out b/build/test/out/test_Dynamische_Amortisationszeit.out index bb06a79..45f8a0d 100755 Binary files a/build/test/out/test_Dynamische_Amortisationszeit.out and b/build/test/out/test_Dynamische_Amortisationszeit.out differ diff --git a/build/test/out/test_Effektivverzinsung.out b/build/test/out/test_Effektivverzinsung.out index bcced59..e607ca4 100755 Binary files a/build/test/out/test_Effektivverzinsung.out and b/build/test/out/test_Effektivverzinsung.out differ diff --git a/build/test/out/test_Finanzierungsregeln.out b/build/test/out/test_Finanzierungsregeln.out index 25e269a..d3ad7ff 100755 Binary files a/build/test/out/test_Finanzierungsregeln.out and b/build/test/out/test_Finanzierungsregeln.out differ diff --git a/build/test/out/test_GewinnMaximum.out b/build/test/out/test_GewinnMaximum.out index 0c1b417..78e31ce 100755 Binary files a/build/test/out/test_GewinnMaximum.out and b/build/test/out/test_GewinnMaximum.out differ diff --git a/build/test/out/test_Kalkulatorische_Zinsen.out b/build/test/out/test_Kalkulatorische_Zinsen.out index e97e068..d68a61d 100755 Binary files a/build/test/out/test_Kalkulatorische_Zinsen.out and b/build/test/out/test_Kalkulatorische_Zinsen.out differ diff --git a/build/test/out/test_Kritische_Menge.out b/build/test/out/test_Kritische_Menge.out index 8a531c8..2cf7a94 100755 Binary files a/build/test/out/test_Kritische_Menge.out and b/build/test/out/test_Kritische_Menge.out differ diff --git a/build/test/out/test_Stueckzeitakkort.out b/build/test/out/test_Stueckzeitakkort.out index aa0f3ce..441e1a5 100755 Binary files a/build/test/out/test_Stueckzeitakkort.out and b/build/test/out/test_Stueckzeitakkort.out differ diff --git a/build/test/out/test_Vadd.out b/build/test/out/test_Vadd.out index 0337afe..371c639 100755 Binary files a/build/test/out/test_Vadd.out and b/build/test/out/test_Vadd.out differ diff --git a/build/test/out/test_Vlength.out b/build/test/out/test_Vlength.out index 1dab191..0eda6f4 100755 Binary files a/build/test/out/test_Vlength.out and b/build/test/out/test_Vlength.out differ diff --git a/build/test/out/test_Vshift.out b/build/test/out/test_Vshift.out index 5adca0f..d9d6c08 100755 Binary files a/build/test/out/test_Vshift.out and b/build/test/out/test_Vshift.out differ diff --git a/build/test/out/test_Zeitlohn.out b/build/test/out/test_Zeitlohn.out index bb3e403..4b5f86d 100755 Binary files a/build/test/out/test_Zeitlohn.out and b/build/test/out/test_Zeitlohn.out differ diff --git a/build/test/out/test_angebotserfolg.out b/build/test/out/test_angebotserfolg.out index 5c71650..6a667ea 100755 Binary files a/build/test/out/test_angebotserfolg.out and b/build/test/out/test_angebotserfolg.out differ diff --git a/build/test/out/test_eigenkapital_Rentabilitaeten.out b/build/test/out/test_eigenkapital_Rentabilitaeten.out index b9887d4..e0d5052 100755 Binary files a/build/test/out/test_eigenkapital_Rentabilitaeten.out and b/build/test/out/test_eigenkapital_Rentabilitaeten.out differ diff --git a/build/test/out/test_erloesfunktion.out b/build/test/out/test_erloesfunktion.out index aca7bcc..3ae9abc 100755 Binary files a/build/test/out/test_erloesfunktion.out and b/build/test/out/test_erloesfunktion.out differ diff --git a/build/test/out/test_gesamtkapital_Rentabilitaeten.out b/build/test/out/test_gesamtkapital_Rentabilitaeten.out index bcd547c..169cc7b 100755 Binary files a/build/test/out/test_gesamtkapital_Rentabilitaeten.out and b/build/test/out/test_gesamtkapital_Rentabilitaeten.out differ diff --git a/build/test/out/test_grenzGewinn.out b/build/test/out/test_grenzGewinn.out index ee5f2db..494ecad 100755 Binary files a/build/test/out/test_grenzGewinn.out and b/build/test/out/test_grenzGewinn.out differ diff --git a/build/test/out/test_marktanteil.out b/build/test/out/test_marktanteil.out index f53ea04..218c543 100755 Binary files a/build/test/out/test_marktanteil.out and b/build/test/out/test_marktanteil.out differ diff --git a/build/test/out/test_trapezFlaeche.out b/build/test/out/test_trapezFlaeche.out index 52f0fbb..01b82d0 100755 Binary files a/build/test/out/test_trapezFlaeche.out and b/build/test/out/test_trapezFlaeche.out differ diff --git a/build/test/results/test_Akkortrichtsatz.pass b/build/test/results/test_Akkortrichtsatz.pass index f170dfe..ada89b6 100644 --- a/build/test/results/test_Akkortrichtsatz.pass +++ b/build/test/results/test_Akkortrichtsatz.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 552.000000 -:time: 0.0013904579998325062 +:time: 0.002053432000138855 diff --git a/build/test/results/test_Anlagenabnutzungsgrad.pass b/build/test/results/test_Anlagenabnutzungsgrad.pass index 1a09f17..132bf42 100644 --- a/build/test/results/test_Anlagenabnutzungsgrad.pass +++ b/build/test/results/test_Anlagenabnutzungsgrad.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 60.000000 -:time: 0.0017952549999336043 +:time: 0.0023919339998883515 diff --git a/build/test/results/test_Anlagenintensitaet.pass b/build/test/results/test_Anlagenintensitaet.pass index 4a9a8f9..9bff4ff 100644 --- a/build/test/results/test_Anlagenintensitaet.pass +++ b/build/test/results/test_Anlagenintensitaet.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 4878.048780 -:time: 0.0019534289999683097 +:time: 0.0024566009999489324 diff --git a/build/test/results/test_Anlagenproduktivitaet.pass b/build/test/results/test_Anlagenproduktivitaet.pass index 0f28191..cb36562 100644 --- a/build/test/results/test_Anlagenproduktivitaet.pass +++ b/build/test/results/test_Anlagenproduktivitaet.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 18.203304 -:time: 0.007422854999958872 +:time: 0.0014570109999567649 diff --git a/build/test/results/test_Arbeitsproduktivitaet.pass b/build/test/results/test_Arbeitsproduktivitaet.pass index 7d29d18..5571543 100644 --- a/build/test/results/test_Arbeitsproduktivitaet.pass +++ b/build/test/results/test_Arbeitsproduktivitaet.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 60.000000 -:time: 0.002285532000087187 +:time: 0.0017615039998872817 diff --git a/build/test/results/test_Cashflow_zu_Gesamtkapital.pass b/build/test/results/test_Cashflow_zu_Gesamtkapital.pass index 3b8f1a9..a56ec7c 100644 --- a/build/test/results/test_Cashflow_zu_Gesamtkapital.pass +++ b/build/test/results/test_Cashflow_zu_Gesamtkapital.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 0.158038 -:time: 0.004868327000167483 +:time: 0.0018574569999145751 diff --git a/build/test/results/test_Dynamische_Amortisationszeit.pass b/build/test/results/test_Dynamische_Amortisationszeit.pass index ae4f9da..f9445b5 100644 --- a/build/test/results/test_Dynamische_Amortisationszeit.pass +++ b/build/test/results/test_Dynamische_Amortisationszeit.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 189.421906 -:time: 0.0016146650000337104 +:time: 0.0018248160001803626 diff --git a/build/test/results/test_Effektivverzinsung.pass b/build/test/results/test_Effektivverzinsung.pass index 3a5758f..7952755 100644 --- a/build/test/results/test_Effektivverzinsung.pass +++ b/build/test/results/test_Effektivverzinsung.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 16.034390 -:time: 0.0016162450001502293 +:time: 0.0015330439998706424 diff --git a/build/test/results/test_Finanzierungsregeln.pass b/build/test/results/test_Finanzierungsregeln.pass index 310e591..04f49c6 100644 --- a/build/test/results/test_Finanzierungsregeln.pass +++ b/build/test/results/test_Finanzierungsregeln.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 0.051041 -:time: 0.0018228599999474682 +:time: 0.0019156160001330136 diff --git a/build/test/results/test_GewinnMaximum.pass b/build/test/results/test_GewinnMaximum.pass index 75bb03c..e3dfff9 100644 --- a/build/test/results/test_GewinnMaximum.pass +++ b/build/test/results/test_GewinnMaximum.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 251.000000 -:time: 0.0032326519999514858 +:time: 0.002028454000083002 diff --git a/build/test/results/test_Kalkulatorische_Zinsen.pass b/build/test/results/test_Kalkulatorische_Zinsen.pass index fa1ee3a..460fe22 100644 --- a/build/test/results/test_Kalkulatorische_Zinsen.pass +++ b/build/test/results/test_Kalkulatorische_Zinsen.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 1.440000 -:time: 0.002472962000183543 +:time: 0.0031119850000322913 diff --git a/build/test/results/test_Kritische_Menge.pass b/build/test/results/test_Kritische_Menge.pass index d43f53a..f1c511b 100644 --- a/build/test/results/test_Kritische_Menge.pass +++ b/build/test/results/test_Kritische_Menge.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss -12.096026 -:time: 0.0019747849999021128 +:time: 0.006126375999883749 diff --git a/build/test/results/test_Stueckzeitakkort.pass b/build/test/results/test_Stueckzeitakkort.pass index a57f07c..93fe59a 100644 --- a/build/test/results/test_Stueckzeitakkort.pass +++ b/build/test/results/test_Stueckzeitakkort.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - '96600.000000' -:time: 0.0018317630001547514 +:time: 0.002688381000098161 diff --git a/build/test/results/test_Vadd.pass b/build/test/results/test_Vadd.pass index 56a6afc..7b89adb 100644 --- a/build/test/results/test_Vadd.pass +++ b/build/test/results/test_Vadd.pass @@ -14,6 +14,5 @@ :passed: 1 :failed: 0 :ignored: 0 -:stdout: -- "(3.000000: " -:time: 0.001914025000132824 +:stdout: [] +:time: 0.007637768999984473 diff --git a/build/test/results/test_Vlength.pass b/build/test/results/test_Vlength.pass index 1844a63..b672962 100644 --- a/build/test/results/test_Vlength.pass +++ b/build/test/results/test_Vlength.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.001506154000026072 +:time: 0.002594053999928292 diff --git a/build/test/results/test_Vshift.pass b/build/test/results/test_Vshift.pass index c4b1ddb..5815034 100644 --- a/build/test/results/test_Vshift.pass +++ b/build/test/results/test_Vshift.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.002754792000132511 +:time: 0.0016183110001293244 diff --git a/build/test/results/test_Zeitlohn.pass b/build/test/results/test_Zeitlohn.pass index aa2036d..7cd9181 100644 --- a/build/test/results/test_Zeitlohn.pass +++ b/build/test/results/test_Zeitlohn.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 3450.000000 -:time: 0.0036282679998294043 +:time: 0.0016626680001081695 diff --git a/build/test/results/test_angebotserfolg.pass b/build/test/results/test_angebotserfolg.pass index 58589a2..6c6c823 100644 --- a/build/test/results/test_angebotserfolg.pass +++ b/build/test/results/test_angebotserfolg.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 225.000000 -:time: 0.0019566180001220346 +:time: 0.002853510000022652 diff --git a/build/test/results/test_eigenkapital_Rentabilitaeten.pass b/build/test/results/test_eigenkapital_Rentabilitaeten.pass index 8645659..6e8a0e7 100644 --- a/build/test/results/test_eigenkapital_Rentabilitaeten.pass +++ b/build/test/results/test_eigenkapital_Rentabilitaeten.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 62.500000 -:time: 0.0015976029999364982 +:time: 0.0037856799999644863 diff --git a/build/test/results/test_erloesfunktion.pass b/build/test/results/test_erloesfunktion.pass index 4bf42c2..11f3da1 100644 --- a/build/test/results/test_erloesfunktion.pass +++ b/build/test/results/test_erloesfunktion.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 4000.000000 -:time: 0.001789418000043952 +:time: 0.00754621800001587 diff --git a/build/test/results/test_gesamtkapital_Rentabilitaeten.pass b/build/test/results/test_gesamtkapital_Rentabilitaeten.pass index 53e63e1..9236516 100644 --- a/build/test/results/test_gesamtkapital_Rentabilitaeten.pass +++ b/build/test/results/test_gesamtkapital_Rentabilitaeten.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 27.136929 -:time: 0.005690295000022161 +:time: 0.0015304190001188545 diff --git a/build/test/results/test_grenzGewinn.pass b/build/test/results/test_grenzGewinn.pass index d44bb8f..df2b946 100644 --- a/build/test/results/test_grenzGewinn.pass +++ b/build/test/results/test_grenzGewinn.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 1141.000000 -:time: 0.0021930570001131855 +:time: 0.005991188000052716 diff --git a/build/test/results/test_marktanteil.pass b/build/test/results/test_marktanteil.pass index 146d1dd..2847ea5 100644 --- a/build/test/results/test_marktanteil.pass +++ b/build/test/results/test_marktanteil.pass @@ -16,4 +16,4 @@ :ignored: 0 :stdout: - Testergebniss 21.739130 -:time: 0.002229749999969499 +:time: 0.0026129730001684948 diff --git a/build/test/results/test_trapezFlaeche.pass b/build/test/results/test_trapezFlaeche.pass index 3ccef5e..3a50734 100644 --- a/build/test/results/test_trapezFlaeche.pass +++ b/build/test/results/test_trapezFlaeche.pass @@ -17,4 +17,4 @@ :stdout: - 'Flaeche vom Trapez betrÃĪgt: 21.000000' - Testergebniss 21.000000 -:time: 0.0014242080001167778 +:time: 0.001807500999802869 diff --git a/src/funktion.c b/src/funktion.c index ae310d7..a0d2f34 100644 --- a/src/funktion.c +++ b/src/funktion.c @@ -134,8 +134,6 @@ double Vlength(float x1, float x2, float x3) { return result; } float Vadd(float x1, float z1) { - float X1; - X1 = x1 + z1; - printf("(%f: \n", X1); - return X1; + double result = x1 + z1; + return result; } diff --git a/src/main.c b/src/main.c index 5e16593..0280e8f 100644 --- a/src/main.c +++ b/src/main.c @@ -109,9 +109,7 @@ int main() x3 = getValue('X'); Vlength(x1, x2, x3); - printf("x eingeben "); x1 = getValue('x'); - printf("a eingeben"); z1 = getValue('z'); Vadd(x1,z1); }