For each resistor found, the series specific error margin is added to the given result

Author: codingbychanche

bin/.gitignore

@@ -0,0 +1,2 @@
+/VoltageDiv/
+/Default/

bin/Default/Main.class

@@ -47,6 +47,7 @@ public static void main(String args[]) {
 if (r.found())
 System.out.println("Trying to find value closest to:" + r.getGivenResistorValue_Ohms() + " Ohms. Found:"
 + r.getFoundResistorValue_Ohms() + " Ohms . Actual error:" + r.getActualError_P()
++ "% Series specific error margin +/-:"+r.getSeriesSpecificErrorMargin()
 + "% Found in Series E" + r.getBelongsToESeries());
 else
 System.out.println("No matching standard value found");
@@ -75,6 +76,7 @@ public static void main(String args[]) {
 + " Voltage error:" + dr.getActualErrorInOutputVoltage_P() + "%");
 }
 
+// Get solution with smallest error in output voltage....
 DividerResult dr = result.getSolutionWsmallestErrInOutputVoltage();
 System.out.println();
 System.out.println("Smallest error in output voltage R1=" + dr.getR1_V() + " Ohm R2=" + dr.getR2_V()

bin/VoltageDiv/GetResistors.class

@@ -102,13 +102,52 @@ public static ResistorResult getRValueClosestTo(double rToTest, double allowedEr
 
 if (MathHelper.isInRangeWithinPercentage(allowedError_P, rToTest, standardValueForR * pow)) {
 
-ResistorResult r = new ResistorResult(standardValueForR * pow, rToTest, e, true);
+//
+// We've found a matching resistor....
+//
+ResistorResult r = new ResistorResult(standardValueForR * pow, rToTest, e, getSeriesSpecificErrorMargin(e), true);
 return r;
 }
 }
 }
 }
-ResistorResult r = new ResistorResult(0, rToTest, 0, false);
+//
+// We've found nothing.....
+//
+ResistorResult r = new ResistorResult(0, rToTest, 0,0, false);
 return r;
 }
+
+/**
+ * Returns the specific error margin for the given E- series.
+ * 
+ * @param e The standard series (E3..E96).
+ * @return Either 0 if no matching series was passed or the specific error
+ * margin in percent for the series passed.
+ */
+
+static private int getSeriesSpecificErrorMargin(int e) {
+
+switch (e) {
+case 3:
+return 25; // Error is > +/- 20% so I choose 25%...
+
+case 6:
+return 20;
+
+case 12:
+return 10;
+
+case 24:
+return 5;
+
+case 48:
+return 2;
+
+case 96:
+return 1;
+
+}
+return 0;
+}
 }

bin/VoltageDiv/ResistorResult.class

@@ -1,7 +1,5 @@
 package VoltageDiv;
 
-import java.math.RoundingMode;
-
 /**
  * Holds a result for a resistor value found inside in any of the series E3..E96
  * 
@@ -16,15 +14,17 @@ public class ResistorResult {
 private double foundResistorValue_Ohms;
 private double givenResistorValue_Ohms;
 private int belongsToESeries;
-private double actualError_P;
+private double actualError_P; // Error between value searched and standard value found.
+private int seriesSpecificErrorMargin;// Error +/- in percent for the series the resistor belongs to.
 private boolean found;
 
-public ResistorResult(double foundResistorValue_Ohms, double givenResistorValue_Ohms, int belongsToESeries,
+public ResistorResult(double foundResistorValue_Ohms, double givenResistorValue_Ohms, int belongsToESeries,int seriesSpecificErrorMargin,
 boolean found) {
 super();
 this.foundResistorValue_Ohms = foundResistorValue_Ohms;
 this.givenResistorValue_Ohms = givenResistorValue_Ohms;
 this.belongsToESeries = belongsToESeries;
+this.seriesSpecificErrorMargin=seriesSpecificErrorMargin;
 this.found = found;
 }
 
@@ -58,6 +58,10 @@ public int getBelongsToESeries() {
 public void setBelongsToESeries(int belongsToESeries) {
 this.belongsToESeries = belongsToESeries;
 }
+
+public int getSeriesSpecificErrorMargin() {
+return this.seriesSpecificErrorMargin;
+}
 
 public boolean found() {
 return found;