diff --git a/build/test/out/c/funktion.o b/build/test/out/c/funktion.o index 96207b8..f7c3d90 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 b4ed782..b6ef12b 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 2beff14..c0bb63d 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 1ff05c0..8f549a3 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 25bf07c..773d88d 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 d269061..55c1c74 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 29fbbc0..71beecf 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 31a0b9a..5f16dc8 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 5dabee3..c0ccb8e 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 35d7112..d8f782a 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 46d18d0..2b0b341 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 7d0e67a..aa1a929 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 fb9c592..1ffd8f0 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 bbd0a27..f1912d2 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_Vlength.out b/build/test/out/test_Vlength.out index 3435c72..207250b 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 bba002f..fcd2cd6 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 ed72667..458e7bb 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 ae63ba2..9ad022b 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 414afc6..9abe55c 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 ef88916..46bbddc 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 e84ba8d..5dce930 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 c2027ec..400a2df 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 7dc8382..698c494 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 d54d13a..9781cd2 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 bbf42c7..aeb5869 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.002716534999990472 +:time: 0.0011608709999109124 diff --git a/build/test/results/test_Anlagenabnutzungsgrad.pass b/build/test/results/test_Anlagenabnutzungsgrad.pass index 71c79a3..730e594 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.0018504879999454715 +:time: 0.001552016999994521 diff --git a/build/test/results/test_Anlagenintensitaet.pass b/build/test/results/test_Anlagenintensitaet.pass index 8e428b8..e8ab9bf 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.0021067100000209393 +:time: 0.0021443269999963377 diff --git a/build/test/results/test_Anlagenproduktivitaet.pass b/build/test/results/test_Anlagenproduktivitaet.pass index d023953..eab30f4 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.006271555000012086 +:time: 0.0015832679998766253 diff --git a/build/test/results/test_Arbeitsproduktivitaet.pass b/build/test/results/test_Arbeitsproduktivitaet.pass index 753eb14..3bd24b4 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.017702286000030654 +:time: 0.0028667300000506657 diff --git a/build/test/results/test_Cashflow_zu_Gesamtkapital.pass b/build/test/results/test_Cashflow_zu_Gesamtkapital.pass index eef6352..eeb30c4 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.0021245269999781158 +:time: 0.0019372640001620312 diff --git a/build/test/results/test_Dynamische_Amortisationszeit.pass b/build/test/results/test_Dynamische_Amortisationszeit.pass index 2d6e196..de81062 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.002250794000019596 +:time: 0.0066594200000054116 diff --git a/build/test/results/test_Effektivverzinsung.pass b/build/test/results/test_Effektivverzinsung.pass index a608753..9dffd00 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.002290294999966136 +:time: 0.0016625740001927625 diff --git a/build/test/results/test_Finanzierungsregeln.pass b/build/test/results/test_Finanzierungsregeln.pass index 075282f..3c33938 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.0019402200000513403 +:time: 0.0020899690000533155 diff --git a/build/test/results/test_GewinnMaximum.pass b/build/test/results/test_GewinnMaximum.pass index 86fcae0..1776d85 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.003772610000055465 +:time: 0.003420550000100775 diff --git a/build/test/results/test_Kalkulatorische_Zinsen.pass b/build/test/results/test_Kalkulatorische_Zinsen.pass index 0353def..6606270 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.0028451340000401615 +:time: 0.0018246979998366442 diff --git a/build/test/results/test_Kritische_Menge.pass b/build/test/results/test_Kritische_Menge.pass index bab50a4..561651c 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.002418125999952281 +:time: 0.004629809999869394 diff --git a/build/test/results/test_Stueckzeitakkort.pass b/build/test/results/test_Stueckzeitakkort.pass index 2ef33fe..e2196d0 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.0021736159999363736 +:time: 0.004610520999904111 diff --git a/build/test/results/test_Vlength.pass b/build/test/results/test_Vlength.pass index f336485..6b669dc 100644 --- a/build/test/results/test_Vlength.pass +++ b/build/test/results/test_Vlength.pass @@ -14,7 +14,5 @@ :passed: 1 :failed: 0 :ignored: 0 -:stdout: -- 'Die laenge das Vektors betraegt: 10.000000' -- '' -:time: 0.0018555540000306792 +:stdout: [] +:time: 0.004921374999867112 diff --git a/build/test/results/test_Vshift.pass b/build/test/results/test_Vshift.pass index 4cbf72e..5787e0d 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.0022123349999674247 +:time: 0.005894744999977775 diff --git a/build/test/results/test_Zeitlohn.pass b/build/test/results/test_Zeitlohn.pass index 1ac1ec8..160398f 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.0013050549999888972 +:time: 0.0012868490000528254 diff --git a/build/test/results/test_angebotserfolg.pass b/build/test/results/test_angebotserfolg.pass index 7173d70..d37b7bd 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.0013557099999843558 +:time: 0.0017269459999624814 diff --git a/build/test/results/test_eigenkapital_Rentabilitaeten.pass b/build/test/results/test_eigenkapital_Rentabilitaeten.pass index ce2eba4..c2385fc 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.0019405639999376945 +:time: 0.004042334000132541 diff --git a/build/test/results/test_erloesfunktion.pass b/build/test/results/test_erloesfunktion.pass index fbb93df..1e6ebbf 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.0014161440000179937 +:time: 0.006942122000054951 diff --git a/build/test/results/test_gesamtkapital_Rentabilitaeten.pass b/build/test/results/test_gesamtkapital_Rentabilitaeten.pass index b7c3a69..0b01de2 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.0015480409999781841 +:time: 0.002042038999888973 diff --git a/build/test/results/test_grenzGewinn.pass b/build/test/results/test_grenzGewinn.pass index fc118e5..1761db4 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.0018914749999794367 +:time: 0.0019287170000552578 diff --git a/build/test/results/test_marktanteil.pass b/build/test/results/test_marktanteil.pass index 4e351a6..bdede30 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.006650595999985853 +:time: 0.0042998090000310185 diff --git a/build/test/results/test_trapezFlaeche.pass b/build/test/results/test_trapezFlaeche.pass index 41f911d..9e74c96 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.001847877000045628 +:time: 0.006522635999999693 diff --git a/src/funktion.c b/src/funktion.c index 0efda39..777a344 100644 --- a/src/funktion.c +++ b/src/funktion.c @@ -125,10 +125,11 @@ float Vshift(float x1, float s1) { } double Vlength(float x1, float x2, float x3) { double X1, X2, X3, E; + double result; X1 = x1 * x1; X2 = x2 * x2; X3 = x3 * x3; E = X1 + X2 + X3; - printf("Die laenge das Vektors betraegt: %f\n\n", sqrt(E)); - return sqrt(E); + result = sqrt(E); + return result; } diff --git a/src/main.c b/src/main.c index 86afffd..6bed386 100644 --- a/src/main.c +++ b/src/main.c @@ -104,12 +104,8 @@ int main() s1 = getValue('s'); Vshift(x1,s1); - printf("Vektor\n"); - printf("x eingeben"); x1 = getValue('X'); - printf("y eingeben "); x2 = getValue('X'); - printf("z eingeben"); x3 = getValue('X'); Vlength(x1, x2, x3); }