switch to indexed loops

Author: baltzell

common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/CompositeField.java

@@ -69,13 +69,12 @@ public String getName() {
 	 * @return <code>true</code> if we have a torus
 	 */
 	public boolean hasTorus() {
-		for (IMagField field : this) {
-			if (field instanceof Torus) {
-				return true;
-			}
-		}
-
-		return false;
+        for (int i=0; i<this.size(); i++) {
+            if (this.get(i) instanceof Torus) {
+                return true;
+            }
+        }
+        return false;
 	}
 
 	/**
@@ -84,12 +83,11 @@ public boolean hasTorus() {
 	 * @return <code>true</code> if we have a solenoid
 	 */
 	public boolean hasSolenoid() {
-		for (IMagField field : this) {
-			if (field instanceof Solenoid) {
+		for (int i=0; i<this.size(); i++) {
+			if (this.get(i) instanceof Solenoid) {
 				return true;
 			}
 		}
-
 		return false;
 	}
 
@@ -99,8 +97,8 @@ public boolean hasSolenoid() {
 	 * @return <code>true</code> if we have a transverse solenoid
 	 */
 	public boolean hasTransverseSolenoid() {
-		for (IMagField field : this) {
-			if (field instanceof TransverseSolenoid) {
+		for (int i=0; i<this.size(); i++) {
+			if (this.get(i) instanceof TransverseSolenoid) {
 				return true;
 			}
 		}
@@ -111,35 +109,35 @@ public boolean hasTransverseSolenoid() {
 	@Override
 	public float getB1(int index) {
 		float b = 0f;
-		for (IMagField field : this) {
-			b += field.getB1(index);
+		for (int i=0; i<this.size(); i++) {
+			b += this.get(i).getB1(index);
 		}
 		return b;
 	}
 
 	@Override
 	public float getB2(int index) {
 		float b = 0f;
-		for (IMagField field : this) {
-			b += field.getB2(index);
+		for (int i=0; i<this.size(); i++) {
+			b += this.get(i).getB2(index);
 		}
 		return b;
 	}
 
 	@Override
 	public float getB3(int index) {
 		float b = 0f;
-		for (IMagField field : this) {
-			b += field.getB3(index);
+		for (int i=0; i<this.size(); i++) {
+			b += this.get(i).getB3(index);
 		}
 		return b;
 	}
 
 	@Override
 	public float getMaxFieldMagnitude() {
 		float max = 0;
-		for (IMagField field : this) {
-			max = Math.max(max, field.getMaxFieldMagnitude());
+		for (int i=0; i<this.size(); i++) {
+			max = Math.max(max, this.get(i).getMaxFieldMagnitude());
 		}
 		return max;
 	}
@@ -157,16 +155,15 @@ public double getScaleFactor() {
 	@Override
 	public void printConfiguration(PrintStream ps) {
 		ps.println("COMPOSITE FIELD");
-		for (IMagField field : this) {
-			field.printConfiguration(ps);
-
+		for (int i=0; i<this.size(); i++) {
+			this.get(i).printConfiguration(ps);
 		}
 	}
 
 	@Override
 	public boolean contains(double x, double y, double z) {
-		for (IMagField field : this) {
-			if (field.contains(x, y, z)) {
+		for (int i=0; i<this.size(); i++) {
+			if (this.get(i).contains(x, y, z)) {
 				return true;
 			}
 		}