refactoring:Vskalort

2 years ago · 70363ea3b8
77 changed files with 41 additions and 47 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_Vmiddle.out
+++ b/build/test/out/test_Vmiddle.out
--- a/build/test/out/test_Vmiddle2.out
+++ b/build/test/out/test_Vmiddle2.out
--- a/build/test/out/test_Vmiddle3.out
+++ b/build/test/out/test_Vmiddle3.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_Vmultiplier3.out
+++ b/build/test/out/test_Vmultiplier3.out
--- a/build/test/out/test_Vparallel.out
+++ b/build/test/out/test_Vparallel.out
--- a/build/test/out/test_Vshift.out
+++ b/build/test/out/test_Vshift.out
--- a/build/test/out/test_Vskalort.out
+++ b/build/test/out/test_Vskalort.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.002397113999904832
+:time: 0.0021953410005153273
--- 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.0016378690006604302
+:time: 0.0024351000001843204
--- 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.0017037560000972007
+:time: 0.0018606740004543099
--- 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.0051029060005021165
+:time: 0.0016116229999170173
--- 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.0015053550005177385
+:time: 0.0019354830001248047
--- 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.0015520320002906374
+:time: 0.003553020999788714
--- 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.003400005999537825
+:time: 0.0016166649993465398
--- 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.0017292699994868599
+:time: 0.0017326669994872645
--- 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.0016367239995815908
+:time: 0.004237866000039503
--- 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.0019253560003562598
+:time: 0.0013034290004725335
--- 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.002106973999616457
+:time: 0.0029109510005582706
--- 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.0033816519999163575
+:time: 0.0017560449996381067
--- 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.0017116799999712384
+:time: 0.001972701999875426
--- 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.002661763000105566
+:time: 0.0028213429995957995
--- 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.0018148959998143255
+:time: 0.005015943999751471
--- 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.0019799410001724027
+:time: 0.0018979090000357246
--- 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.002191317999859166
+:time: 0.004810903999896254
--- a/build/test/results/test_Vmiddle.pass
+++ b/build/test/results/test_Vmiddle.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.004097662999811291
+:time: 0.00447749799968733
--- a/build/test/results/test_Vmiddle2.pass
+++ b/build/test/results/test_Vmiddle2.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.0013325170002644882
+:time: 0.0018228869994345587
--- a/build/test/results/test_Vmiddle3.pass
+++ b/build/test/results/test_Vmiddle3.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.003859141999782878
+:time: 0.0036964020000596065
--- 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.002156450000256882
+:time: 0.002029373999903328
--- 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.006454375000430446
+:time: 0.002149492000171449
--- a/build/test/results/test_Vmultiplier3.pass
+++ b/build/test/results/test_Vmultiplier3.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.002986141000292264
+:time: 0.002835910999237967
--- a/build/test/results/test_Vparallel.pass
+++ b/build/test/results/test_Vparallel.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.0016824849999466096
+:time: 0.004778819999955886
--- 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.0012992580004720367
+:time: 0.007009155000559986
--- a/build/test/results/test_Vskalort.pass
+++ b/build/test/results/test_Vskalort.pass
@ -15,4 +15,4 @@
  :failed: 0
  :ignored: 0
 :stdout: []
-:time: 0.001960815000529692
+:time: 0.005192976999751409
--- 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.00525231099982193
+:time: 0.004478492000089318
--- 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.0019490300001052674
+:time: 0.0051441159994283225
--- 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.0016022159998101415
+:time: 0.0018999519998033065
--- 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.0037747840005977196
+:time: 0.00453161200039176
--- 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.002466604999426636
+:time: 0.0019300260000818525
--- 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.0019096650003120885
+:time: 0.006333573000119941
--- 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.0015110880003703642
+:time: 0.0014883139992889483
--- 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.0015217259997371002
+:time: 0.005205324000598921
--- 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.0014132480000625947
+:time: 0.0024794129994916148
--- 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.002088727999762341
+:time: 0.0017361050004183198
--- 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.0016697139999450883
+:time: 0.0015049180001369677
--- a/src/funktion.c
+++ b/src/funktion.c
@ -218,10 +218,12 @@ float Vmiddle3(float x3, float z3) {
 }
 float Vskalort(float x1, float x2, float x3, float z1, float z2, float z3) {
    float E;
+    double result;
    E = x1 * z1 + x2 * z2 + x3 * z3;
    if (E == 0) {
-        return 1;
+        result = 1;
    } else {
-        return 0;
+        result = 0;
    }
+    return result;
 }
--- a/src/main.c
+++ b/src/main.c
@ -165,20 +165,12 @@ int main()
    z3 = getValue('Z');
    Vmiddle3(x3, z3);

-    printf("1. Vektor\n");
-    printf("x eingeben");
    x1 = getValue('X');
-    printf("y eingeben ");
    x2 = getValue('X');
-    printf("z eingeben");
    x3 = getValue('X');

-    printf("2. Vektor\n");
-    printf("a eingeben");
    z1 = getValue('Z');
-    printf("b eingeben ");
    z2 = getValue('Z');
-    printf("c eingeben");
    z3 = getValue('Z');
    Vskalort(x1, x2, x3, z1, z2, z3);
 }