mechanical-tolerance-calculator 1.0.5 → 1.0.6

package/index.js

@@ -225,7 +225,7 @@ function processOneMeasurement(materialType, measurement, tolerances) {
   );
   return {
     ...processedMeasurement,
-    meets_IT_tolerance: processedMeasurement.meet_specification,
+    meets_IT_tolerance: processedMeasurement.meets_specification.meetsSpec,
   };
 }
 
@@ -303,21 +303,13 @@ function parseStringFloat(value) {
   // Return 0 if parsing fails (NaN)
   return isNaN(parsed) ? 0 : parsed;
 }
-function processIndividualMeasurement(
-  materialType,
-  measurement,
-  tolerances,
-  meetsIT,
-  ITMeetingReason
-) {
+function processIndividualMeasurement(materialType, measurement, tolerances) {
   const processedMeasurement = processMeasurement(
     materialType,
     measurement,
     tolerances
   );
-  return {
-    ...processedMeasurement,
-  };
+  return processedMeasurement;
 }
 
 function checkMultipleMeasurementsFor(materialType, measurements) {
@@ -333,27 +325,28 @@ function checkMultipleMeasurementsFor(materialType, measurements) {
     largestMeasurement - smallestMeasurement
   );
 
-  const ITs = {
-    IT5: 0,
-    IT6: 0,
-    IT7: 0,
-    IT8: 0,
-    IT9: 0,
-  };
-
+  const nominals = {};
+  let count = 0;
   const results = measurements.map((measurement) => {
     const result = processIndividualMeasurement(
       camcoStandardTolerances.type,
       measurement,
       camcoStandardTolerances
     );
-
-    ITs[result.IT_grade]++;
-
+    nominals[result.nominal] = count++;
     return result;
   });
 
-  const baseSpec = results[0];
+  let countOfMostOccuredNominal = Math.max(...Object.values(nominals));
+
+  let mostOccuredNominal = Object.keys(nominals).find(
+    (nominal) => nominals[nominal] === countOfMostOccuredNominal
+  );
+  console.log(mostOccuredNominal);
+
+  const baseSpec = results.find(
+    (result) => result.nominal === parseInt(mostOccuredNominal)
+  );
   const baseITValue = baseSpec.matched_spec[baseSpec.IT_grade];
 
   const meetsIT = ITDifference <= baseITValue;
@@ -369,9 +362,25 @@ function checkMultipleMeasurementsFor(materialType, measurements) {
         smallestMeasurement
       )} is greater than to ${baseITValue}.`;
 
+  // Check if measurement meets specification
+  const meetsSpec = checkMeetsSpecification(
+    largestMeasurement,
+    baseSpec?.computed_specification_bounds
+  );
+  console.log(meetsSpec);
+
+  const specMeetingReason = meetsSpec
+    ? `${parseToFixedThreeString(baseSpec.measurement)} falls between ${
+        baseSpec.computed_specification_bounds.lowerBound
+      } and ${baseSpec.computed_specification_bounds.upperBound}`
+    : `${parseToFixedThreeString(largestMeasurement)} doesn't fall between ${
+        baseSpec.computed_specification_bounds.lowerBound
+      } and ${baseSpec.computed_specification_bounds.upperBound}`;
   return {
-    baseSpec,
+    meets_specification: { meetsSpec, reason: specMeetingReason },
     meets_IT_Tolerance: { meetsIT, reason: itMeetingReason },
+    meets_final_compliance: meetsIT && baseSpec?.meets_specification?.meetsSpec,
+    ...baseSpec,
   };
 }
 
@@ -387,7 +396,6 @@ function validateMeasurements(measurements) {
       error: "Measurements array cannot be empty",
     };
   }
-
   return null;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mechanical-tolerance-calculator",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Calculates international standard specification and  tolerances for bores, round bars and metals of mechanical units. For examples; H7, H8, H9, h8, h9 specifications and IT5/IT6 tolerances.",
   "main": "index.js",
   "scripts": {