askill
/
AP-SCE
mirror of https://github.com/Askill/AP-SCE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed unit conversion errors

This commit is contained in:
Patrice Matz 2017-10-22 15:23:07 +02:00
parent da8168f2cf
commit 41b85a5124
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SCE/SCE/3d.h
View File

@ -61,7 +61,7 @@ public:
cout << "Definieren Sie die Teilabschnitte des Zylinders" << endl; cout << "Definieren Sie die Teilabschnitte des Zylinders" << endl;
cout << " Laenge: "; cin >> teil_lange; heights.push_back(teil_lange); cout << " Laenge in mm: "; cin >> teil_lange; heights.push_back(teil_lange);
cout << " Durchmesser in mm: "; cin >> teil_durchmesser; radii.push_back(teil_durchmesser); cout << " Durchmesser in mm: "; cin >> teil_durchmesser; radii.push_back(teil_durchmesser);
cout << " Dichte in g/mm^3: "; cin >> teil_dichte; densities.push_back(teil_dichte); cout << " Dichte in g/mm^3: "; cin >> teil_dichte; densities.push_back(teil_dichte);
cout << " Spezifischer Widerstand in ohm * (mm^2) / m: "; cin >> teil_widerstand; resistances.push_back(teil_widerstand); cout << " Spezifischer Widerstand in ohm * (mm^2) / m: "; cin >> teil_widerstand; resistances.push_back(teil_widerstand);
@ -110,7 +110,7 @@ public:
Circle circle; Circle circle;
for (int i = 0; heights.size() != i; i++) for (int i = 0; heights.size() != i; i++)
{ {
mass = mass + heights[i] * circle.compute_area(radii[i]) * densities[i]; mass = mass + heights[i]/10 * circle.compute_area(radii[i]/10) * densities[i];
} }
set_mass(mass); set_mass(mass);
return mass; return mass;
@ -121,7 +121,7 @@ public:
Circle circle; Circle circle;
for (int i = 0; heights.size() != i; i++) for (int i = 0; heights.size() != i; i++)
{ {
resistance = resistance + heights[i] * 1000 * circle.compute_area(radii[i]) * resistances[i]; resistance = resistance + ((heights[i]/1000) * resistances[i]) / circle.compute_area(radii[i]);
} }
set_electric_resistance(resistance); set_electric_resistance(resistance);
return resistance; return resistance;