hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixes #774] Override-component-mass works correctly on massive components

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-10-11 08:58:20 -04:00 committed by Billy Olsen
parent a4e7f2175c
commit ccc8e4ab80
2 changed files with 76 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/masscalc/MassCalculation.java
View File

@ -344,12 +344,13 @@ public class MassCalculation {
// mass data for *this component only* in the rocket-frame // mass data for *this component only* in the rocket-frame
compCM = parentTransform.transform( compCM.add(component.getPosition()) ); compCM = parentTransform.transform( compCM.add(component.getPosition()) );
if (component.getOverrideSubcomponents()) { if (component.getOverrideSubcomponents()) {
if (component.isMassOverridden()) { if( component.isMassive() ){
double newMass = MathUtil.max(component.getOverrideMass(), MIN_MASS); // if this component mass, merge it in before overriding:
Coordinate newCM = this.getCM().setWeight( newMass ); this.addMass( compCM );
this.setCM( newCM ); }
if (component.isMassOverridden()) {
this.setCM( this.getCM().setWeight(component.getOverrideMass()) );
} }
if (component.isCGOverridden()) { if (component.isCGOverridden()) {
this.setCM( this.getCM().setX( compCM.x + component.getOverrideCGX())); this.setCM( this.getCM().setX( compCM.x + component.getOverrideCGX()));
} }

103
core/test/net/sf/openrocket/masscalc/MassCalculatorTest.java
View File

@ -213,61 +213,84 @@ public class MassCalculatorTest extends BaseTestCase {
} }
} }
@Test @Test
public void testStageMassOverride() { public void testSingleStageMassOverride() {
final Rocket rocket = TestRockets.makeSimple2Stage(); final Rocket rocket = TestRockets.makeSimple2Stage();
final AxialStage sustainerStage = (AxialStage) rocket.getChild(0); final AxialStage sustainerStage = (AxialStage) rocket.getChild(0);
final AxialStage boosterStage = (AxialStage) rocket.getChild(1); final BodyTube sustainerBody = (BodyTube) sustainerStage.getChild(0);
final FlightConfiguration config = rocket.getSelectedConfiguration(); final FlightConfiguration config = rocket.getSelectedConfiguration();
config.setOnlyStage(0);
final double expSingleBodyMass = 0.0040589377;
{ // [0] verify / document structure { // [0] verify / document structure
final double expMass = 0.0040589377;
final BodyTube sustainerBody = (BodyTube) sustainerStage.getChild(0);
assertEquals(0.0, sustainerBody.getPosition().x, EPSILON); assertEquals(0.0, sustainerBody.getPosition().x, EPSILON);
assertEquals(0.1, sustainerBody.getLength(), EPSILON); assertEquals(0.1, sustainerBody.getLength(), EPSILON);
assertEquals(expMass, sustainerBody.getMass(), EPSILON); assertEquals(expSingleBodyMass, sustainerBody.getMass(), EPSILON);
final BodyTube boosterBody = (BodyTube) boosterStage.getChild(0);
assertEquals(0.10, boosterBody.getComponentLocations()[0].x, EPSILON);
assertEquals(0.10, boosterBody.getLength(), EPSILON);
assertEquals(expMass, sustainerBody.getMass(), EPSILON);
} }
{ // [1] test Rocket CM, before:
final RigidBody actualStructure = MassCalculator.calculateStructure(config);
final double actualRocketDryMass = actualStructure.cm.weight;
assertEquals(expSingleBodyMass, actualRocketDryMass, EPSILON);
final Coordinate actualRocketDryCM = actualStructure.cm;
assertEquals(0.05, actualRocketDryCM.x, EPSILON);
}
sustainerStage.setOverrideSubcomponents(true);
sustainerStage.setMassOverridden(true);
sustainerStage.setOverrideMass(0.001); // something small, but not zero
{ // [1] test Rocket CM, before: { // [1] test Rocket CM, before:
final RigidBody actualStructure = MassCalculator.calculateStructure(config); final RigidBody actualStructure = MassCalculator.calculateStructure(config);
final double actualRocketDryMass = actualStructure.cm.weight; final double actualRocketDryMass = actualStructure.cm.weight;
final double expRocketDryMass = 0.0081178754; final double expRocketDryMass = 0.001;
assertEquals(expRocketDryMass, actualRocketDryMass, EPSILON); assertEquals(expRocketDryMass, actualRocketDryMass, EPSILON);
final Coordinate actualRocketDryCM = actualStructure.cm; final Coordinate actualRocketDryCM = actualStructure.cm;
final double expCMx = 0.10; final double expCMx = 0.05;
assertEquals(expCMx, actualRocketDryCM.x, EPSILON); assertEquals(expCMx, actualRocketDryCM.x, EPSILON);
} }
}
@Test
public void testDoubleStageMassOverride() {
final Rocket rocket = TestRockets.makeSimple2Stage();
final AxialStage sustainerStage = (AxialStage) rocket.getChild(0);
final BodyTube sustainerBody = (BodyTube) sustainerStage.getChild(0);
final AxialStage boosterStage = (AxialStage) rocket.getChild(1);
final BodyTube boosterBody = (BodyTube) boosterStage.getChild(0); final BodyTube boosterBody = (BodyTube) boosterStage.getChild(0);
final double bodyMass = boosterBody.getMass(); final FlightConfiguration config = rocket.getSelectedConfiguration();
assertEquals(0.0040589377, bodyMass, EPSILON);
final double expSingleBodyMass = 0.0040589377;
{ // [0] verify / document structure
assertEquals(0.0, sustainerBody.getPosition().x, EPSILON);
assertEquals(0.1, sustainerBody.getLength(), EPSILON);
assertEquals(expSingleBodyMass, sustainerBody.getMass(), EPSILON);
assertEquals(0.0, boosterBody.getPosition().x, EPSILON);
assertEquals(0.1, boosterBody.getLength(), EPSILON);
assertEquals(expSingleBodyMass, boosterBody.getMass(), EPSILON);
}
{ // [1] test Rocket CM, before:
final RigidBody actualStructure = MassCalculator.calculateStructure(config);
assertEquals(2*expSingleBodyMass, actualStructure.cm.weight, EPSILON);
assertEquals(0.10, actualStructure.cm.x, EPSILON);
}
boosterStage.setOverrideSubcomponents(true); boosterStage.setOverrideSubcomponents(true);
boosterStage.setMassOverridden(true); boosterStage.setMassOverridden(true);
boosterStage.setOverrideMass(bodyMass); boosterStage.setOverrideMass(0.001); // something small, but not zero
boosterBody.setOverrideSubcomponents(false); { // [1] test Rocket CM, after:
boosterBody.setMassOverridden(true);
boosterBody.setOverrideMass(0.0);
{ // [1] test Rocket CM, before:
final RigidBody actualStructure = MassCalculator.calculateStructure(config); final RigidBody actualStructure = MassCalculator.calculateStructure(config);
final double actualRocketDryMass = actualStructure.cm.weight; final double actualRocketDryMass = actualStructure.cm.weight;
final double expRocketDryMass = 0.0081178754; assertEquals(expSingleBodyMass+0.001, actualRocketDryMass, EPSILON);
assertEquals(expRocketDryMass, actualRocketDryMass, EPSILON);
final Coordinate actualRocketDryCM = actualStructure.cm; final Coordinate actualRocketDryCM = actualStructure.cm;
final double expCMx = 0.10; assertEquals(0.06976699, actualRocketDryCM.x, EPSILON);
assertEquals(expCMx, actualRocketDryCM.x, EPSILON);
} }
} }
@ -326,15 +349,15 @@ public class MassCalculatorTest extends BaseTestCase {
final BodyTube boosterBody = (BodyTube) boosterStage.getChild(0); final BodyTube boosterBody = (BodyTube) boosterStage.getChild(0);
final FlightConfiguration config = rocket.getSelectedConfiguration(); final FlightConfiguration config = rocket.getSelectedConfiguration();
final double expBodyMass = 0.0040589377; final double expSingleBodyMass = 0.0040589377;
{ // [0] verify / document structure { // [0] verify / document structure
assertEquals(0.0, sustainerBody.getPosition().x, EPSILON); assertEquals(0.0, sustainerBody.getPosition().x, EPSILON);
assertEquals(0.1, sustainerBody.getLength(), EPSILON); assertEquals(0.1, sustainerBody.getLength(), EPSILON);
assertEquals(expBodyMass, sustainerBody.getMass(), EPSILON); assertEquals(expSingleBodyMass, sustainerBody.getMass(), EPSILON);
assertEquals(0.10, boosterBody.getComponentLocations()[0].x, EPSILON); assertEquals(0.10, boosterBody.getComponentLocations()[0].x, EPSILON);
assertEquals(0.10, boosterBody.getLength(), EPSILON); assertEquals(0.10, boosterBody.getLength(), EPSILON);
assertEquals(expBodyMass, boosterBody.getMass(), EPSILON); assertEquals(expSingleBodyMass, boosterBody.getMass(), EPSILON);
} }
{ // [1] test Rocket CM, before: { // [1] test Rocket CM, before:
@ -351,16 +374,30 @@ public class MassCalculatorTest extends BaseTestCase {
boosterBody.setOverrideSubcomponents(false); boosterBody.setOverrideSubcomponents(false);
boosterBody.setMassOverridden(true); boosterBody.setMassOverridden(true);
boosterBody.setOverrideMass(0.0); boosterBody.setOverrideMass(0.001);
{ // [1] test Rocket CM, before: { // [1] test Rocket CM, after:
final RigidBody actualStructure = MassCalculator.calculateStructure(config); final RigidBody actualStructure = MassCalculator.calculateStructure(config);
final double actualRocketDryMass = actualStructure.cm.weight; final double actualRocketDryMass = actualStructure.cm.weight;
assertEquals(expBodyMass, actualRocketDryMass, EPSILON); assertEquals(expSingleBodyMass+0.001, actualRocketDryMass, EPSILON);
final Coordinate actualRocketDryCM = actualStructure.cm; final Coordinate actualRocketDryCM = actualStructure.cm;
assertEquals(0.050, actualRocketDryCM.x, EPSILON); assertEquals(0.06976699, actualRocketDryCM.x, EPSILON);
}
boosterBody.setOverrideSubcomponents(true); // change. Also, this body lacks subcomponents.
boosterBody.setMassOverridden(true); // repeat
boosterBody.setOverrideMass(0.001); // repeat
{ // [1] test Rocket CM, after:
final RigidBody actualStructure = MassCalculator.calculateStructure(config);
final double actualRocketDryMass = actualStructure.cm.weight;
assertEquals(expSingleBodyMass+0.001, actualRocketDryMass, EPSILON);
final Coordinate actualRocketDryCM = actualStructure.cm;
assertEquals(0.06976699, actualRocketDryCM.x, EPSILON);
} }
} }