refactoring:Vmultiplier2

2 years ago · c40bfa51b8
65 changed files with 33 additions and 35 deletions
--- a/build/test/out/c/funktion.o
+++ b/build/test/out/c/funktion.o
--- a/build/test/out/test_Akkortrichtsatz.out
+++ b/build/test/out/test_Akkortrichtsatz.out
--- a/build/test/out/test_Anlagenabnutzungsgrad.out
+++ b/build/test/out/test_Anlagenabnutzungsgrad.out
--- a/build/test/out/test_Anlagenintensitaet.out
+++ b/build/test/out/test_Anlagenintensitaet.out
--- a/build/test/out/test_Anlagenproduktivitaet.out
+++ b/build/test/out/test_Anlagenproduktivitaet.out
--- a/build/test/out/test_Arbeitsproduktivitaet.out
+++ b/build/test/out/test_Arbeitsproduktivitaet.out
--- a/build/test/out/test_Cashflow_zu_Gesamtkapital.out
+++ b/build/test/out/test_Cashflow_zu_Gesamtkapital.out
--- a/build/test/out/test_Dynamische_Amortisationszeit.out
+++ b/build/test/out/test_Dynamische_Amortisationszeit.out
--- a/build/test/out/test_Effektivverzinsung.out
+++ b/build/test/out/test_Effektivverzinsung.out
--- a/build/test/out/test_Finanzierungsregeln.out
+++ b/build/test/out/test_Finanzierungsregeln.out
--- a/build/test/out/test_GewinnMaximum.out
+++ b/build/test/out/test_GewinnMaximum.out
--- a/build/test/out/test_Kalkulatorische_Zinsen.out
+++ b/build/test/out/test_Kalkulatorische_Zinsen.out
--- a/build/test/out/test_Kritische_Menge.out
+++ b/build/test/out/test_Kritische_Menge.out
--- a/build/test/out/test_Stueckzeitakkort.out
+++ b/build/test/out/test_Stueckzeitakkort.out
--- a/build/test/out/test_Vadd.out
+++ b/build/test/out/test_Vadd.out
--- a/build/test/out/test_Vaddx2.out
+++ b/build/test/out/test_Vaddx2.out
--- a/build/test/out/test_Vaddx3.out
+++ b/build/test/out/test_Vaddx3.out
--- a/build/test/out/test_Vlength.out
+++ b/build/test/out/test_Vlength.out
--- a/build/test/out/test_Vmultiplier.out
+++ b/build/test/out/test_Vmultiplier.out
--- a/build/test/out/test_Vmultiplier2.out
+++ b/build/test/out/test_Vmultiplier2.out
--- a/build/test/out/test_Vshift.out
+++ b/build/test/out/test_Vshift.out
--- a/build/test/out/test_Vsubstract.out
+++ b/build/test/out/test_Vsubstract.out
--- a/build/test/out/test_Vsubstract2.out
+++ b/build/test/out/test_Vsubstract2.out
--- a/build/test/out/test_Vsubstract3.out
+++ b/build/test/out/test_Vsubstract3.out
--- a/build/test/out/test_Zeitlohn.out
+++ b/build/test/out/test_Zeitlohn.out
--- a/build/test/out/test_angebotserfolg.out
+++ b/build/test/out/test_angebotserfolg.out
--- a/build/test/out/test_eigenkapital_Rentabilitaeten.out
+++ b/build/test/out/test_eigenkapital_Rentabilitaeten.out
--- a/build/test/out/test_erloesfunktion.out
+++ b/build/test/out/test_erloesfunktion.out
--- a/build/test/out/test_gesamtkapital_Rentabilitaeten.out
+++ b/build/test/out/test_gesamtkapital_Rentabilitaeten.out
--- a/build/test/out/test_grenzGewinn.out
+++ b/build/test/out/test_grenzGewinn.out
--- a/build/test/out/test_marktanteil.out
+++ b/build/test/out/test_marktanteil.out
--- a/build/test/out/test_trapezFlaeche.out
+++ b/build/test/out/test_trapezFlaeche.out
--- 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.0011263830001553288
+:time: 0.0017879839997476665
--- 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.0022562749991266173
+:time: 0.0011863270001413184
--- 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.0015553719995295978
+:time: 0.0013548819997595274
--- 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.002030751999882341
+:time: 0.005111892999593692
--- 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.0047685760000604205
+:time: 0.001362074999633478
--- 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.001223633999870799
+:time: 0.0013153370000509312
--- 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.0026688899997679982
+:time: 0.0015316280005208682
--- 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.0012433439997039386
+:time: 0.0013082690002192976
--- 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.0013256290003482718
+:time: 0.0044863940001960145
--- 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.0022994790006123367
+:time: 0.002447654000206967
--- 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.004076656000506773
+:time: 0.0026904609994744533
--- 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.001228298000569339
+:time: 0.0024274360002891626
--- 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.008353543000339414
+:time: 0.0012672310003836174
--- a/build/test/results/test_Vadd.pass
+++ b/build/test/results/test_Vadd.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.007258048999574385
+:time: 0.0011486069997772574
--- a/build/test/results/test_Vaddx2.pass
+++ b/build/test/results/test_Vaddx2.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.005947575000391225
+:time: 0.0011888209992321208
--- a/build/test/results/test_Vaddx3.pass
+++ b/build/test/results/test_Vaddx3.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.005626187999951071
+:time: 0.0018598360002215486
--- 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.001738971999657224
+:time: 0.0011884530003953842
--- a/build/test/results/test_Vmultiplier.pass
+++ b/build/test/results/test_Vmultiplier.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.002298116000019945
+:time: 0.001309680999838747
--- a/build/test/results/test_Vmultiplier2.pass
+++ b/build/test/results/test_Vmultiplier2.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.0012486360001275898
+:time: 0.0015583599997626152
--- 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.0012592879993462702
+:time: 0.0015429700006279745
--- a/build/test/results/test_Vsubstract.pass
+++ b/build/test/results/test_Vsubstract.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.001315573999818298
+:time: 0.0011624130002019228
--- a/build/test/results/test_Vsubstract2.pass
+++ b/build/test/results/test_Vsubstract2.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.001605801000550855
+:time: 0.0015028279995021876
--- a/build/test/results/test_Vsubstract3.pass
+++ b/build/test/results/test_Vsubstract3.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.0012224369993418804
+:time: 0.0022041729998818482
--- 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.0015749899994261796
+:time: 0.0015169349999268888
--- 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.0018818939997800044
+:time: 0.0012356400002317969
--- 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.001288671999645885
+:time: 0.0018756720000965288
--- 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.0012999050004509627
+:time: 0.001238995999301551
--- 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.0013267409995023627
+:time: 0.0017924490002769744
--- 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.0016161809999175603
+:time: 0.001346261999970011
--- 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.0035302890000821208
+:time: 0.0013595889995485777
--- 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.0016192000002774876
+:time: 0.0012582679992192425
--- a/src/funktion.c
+++ b/src/funktion.c
@ -162,7 +162,6 @@ float Vmultiplier(float x1,float m) {
    return result;
 }
 float Vmultiplier2(float x2,float m) {
-    x2 = x2 * m;
-    printf("|%f|",x2);
-    return x2;
+    double result  = x2 * m;
+    return result;
 }
--- a/src/main.c
+++ b/src/main.c
@ -137,7 +137,6 @@ int main()
    m = getValue('M');
    Vmultiplier(x1, m);

-    printf("y eingeben ");
    x2 = getValue('X');
    m = getValue('M');
    Vmultiplier(x2, m);