Merge pull request #4973 from SJuliez/weight-calc

Weight calculation

megamek/src/megamek/common/Entity.java

@@ -11079,6 +11079,11 @@ public Engine getEngine() {
         return engine;
     }
 
+    /** @return The type of engine if it has an engine, or Engine.NONE, if it has no engine. */
+    public int getEngineType() {
+        return hasEngine() ? getEngine().getEngineType() : Engine.NONE;
+    }
+
     public boolean hasEngine() {
         return (null != engine);
     }

megamek/src/megamek/common/verifier/TestAdvancedAerospace.java

@@ -1071,7 +1071,7 @@ public StringBuffer printEntity() {
     }
 
     @Override
-    public double calculateWeight() {
+    public double calculateWeightExact() {
         double weight = 0;
         weight += getWeightStructure();
         weight += getWeightEngine();

megamek/src/megamek/common/verifier/TestAero.java

@@ -1070,7 +1070,7 @@ public StringBuffer printEntity() {
     }
 
     @Override
-    public double calculateWeight() {
+    public double calculateWeightExact() {
         double weight = 0;
         weight += getWeightEngine();
         weight += getWeightControls();

megamek/src/megamek/common/verifier/TestBattleArmor.java

@@ -1348,7 +1348,7 @@ public double calculateWeight(int trooper) {
     }
 
     @Override
-    public double calculateWeight() {
+    public double calculateWeightExact() {
         double totalWeight = 0.0;
         for (int i = 0; i < ba.getTroopers(); i++) {
             totalWeight += calculateWeight(i);

megamek/src/megamek/common/verifier/TestEntity.java

@@ -860,7 +860,32 @@ public static int calcHeatNeutralHSRequirement(Entity entity) {
         return heat;
     }
 
+    /**
+     * According to TM, unit weights are to be rounded up to the nearest half ton or kilo. This method
+     * returns the rounded weight.
+     *
+     * @return The weight of the unit, rounded up according to TM, p.22.
+     */
     public double calculateWeight() {
+        double weight = calculateWeightExact();
+        // If the unit used kg standard, we just need to get rid of floating-point math anomalies.
+        // Otherwise accumulated kg-scale equipment needs to be rounded up to the nearest half-ton.
+        weight = round(weight, Ceil.KILO);
+        if (usesKgStandard()) {
+            return weight;
+        } else {
+            return ceil(weight, Ceil.HALFTON);
+        }
+    }
+
+    /**
+     * According to TM p.22, unit weights are to be rounded up to the nearest half ton or kilo, but in MML
+     * for construction at least we should be able to show the exact weight. This method returns the unrounded
+     * weight.
+     *
+     * @return The unrounded weight of the unit.
+     */
+    public double calculateWeightExact() {
         double weight = 0;
         weight += getWeightEngine();
         weight += getWeightStructure();
@@ -877,14 +902,7 @@ public double calculateWeight() {
         weight += getWeightCarryingSpace();
 
         weight += getArmoredComponentWeight();
-        // If the unit used kg standard, we just need to get rid of floating-point math anomalies.
-        // Otherwise accumulated kg-scale equipment needs to be rounded up to the nearest half-ton.
-        weight = round(weight, Ceil.KILO);
-        if (usesKgStandard()) {
-            return weight;
-        } else {
-            return ceil(weight, Ceil.HALFTON);
-        }
+        return weight;
     }
 
     public String printWeightCalculation() {
@@ -1671,6 +1689,14 @@ boolean usesKgStandard() {
         return usesKgStandard(getEntity());
     }
 
+
+    public int totalCritSlotCount() {
+        int slotCount = 0;
+        for (int i = 0; i < getEntity().locations(); i++) {
+            slotCount += getEntity().getNumberOfCriticals(i);
+        }
+        return slotCount;
+    }
 } // End class TestEntity
 
 class Armor {

megamek/src/megamek/common/verifier/TestInfantry.java

@@ -287,10 +287,9 @@ public String getName() {
     public double getWeightPowerAmp() {
         return 0;
     }
-    
+
     @Override
-    public double calculateWeight() {
+    public double calculateWeightExact() {
         return infantry.getWeight();
     }
-
 }

megamek/src/megamek/common/verifier/TestProtomech.java

@@ -244,9 +244,9 @@ public int getCountHeatSinks() {
     @Override
     public double calculateWeight() {
         // Deal with some floating point precision issues
-        return round(super.calculateWeight(), Ceil.KILO);
+        return round(super.calculateWeightExact(), Ceil.KILO);
     }
-    
+
     @Override
     public double getWeightAllocatedArmor() {
         ProtomechArmor armor = ProtomechArmor.getArmor(proto);

megamek/src/megamek/common/verifier/TestSmallCraft.java

@@ -808,7 +808,7 @@ public StringBuffer printEntity() {
     }
 
     @Override
-    public double calculateWeight() {
+    public double calculateWeightExact() {
         double weight = 0;
         weight += getWeightStructure();
         weight += getWeightEngine();

megamek/src/megamek/common/verifier/TestSupportVehicle.java

@@ -715,7 +715,12 @@ private double ceilWeight(double val) {
 
     @Override
     public double calculateWeight() {
-        return ceilWeight(super.calculateWeight() + getFuelTonnage());
+        return ceilWeight(calculateWeightExact());
+    }
+
+    @Override
+    public double calculateWeightExact() {
+        return super.calculateWeightExact() + getFuelTonnage();
     }
 
     @Override