Skip to content

switch to index loops in hotspot #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baltzell wants to merge 1 commit into
base: development
Choose a base branch
from
Open

switch to index loops in hotspot #1552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/CompositeProbe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

public class CompositeProbe extends FieldProbe {

protected ArrayList<FieldProbe> probes = new ArrayList<FieldProbe>();
protected ArrayList<FieldProbe> probes = new ArrayList<>();

/**
* Create a composite probe from a composite field.
Expand Down Expand Up @@ -43,8 +43,9 @@ public void field(int sector, float x, float y, float z, float[] result) {
z = result[2];

float bx = 0, by = 0, bz = 0;
for (IField probe : probes) {
probe.field(x, y, z, result);
int size = probes.size();
for (int i=0; i<size; i++) {
probes.get(i).field(x, y, z, result);
bx += result[0];
by += result[1];
bz += result[2];
Expand All @@ -61,8 +62,9 @@ public void field(float x, float y, float z, float result[]) {
float by = 0;
float bz = 0;

for (IField probe : probes) {
probe.field(x, y, z, result);
int size = probes.size();
for (int i=0; i<size; i++) {
probes.get(i).field(x, y, z, result);
bx += result[0];
by += result[1];
bz += result[2];
Expand All @@ -80,8 +82,9 @@ public void field(float x, float y, float z, float result[]) {
*/
@Override
public boolean isZeroField() {
for (IField probe : probes) {
if (!probe.isZeroField()) {
int size = probes.size();
for (int i=0; i<size; i++) {
if (!probes.get(i).isZeroField()) {
return false;
}
}
Expand All @@ -103,8 +106,9 @@ public boolean isZeroField() {
@Override
public void gradient(float x, float y, float z, float result[]) {
float bx = 0, by = 0, bz = 0;
for (IField probe : probes) {
probe.gradient(x, y, z, result);
int size = probes.size();
for (int i=0; i<size; i++) {
probes.get(i).gradient(x, y, z, result);
bx += result[0];
by += result[1];
bz += result[2];
Expand All @@ -120,8 +124,9 @@ public void gradient(float x, float y, float z, float result[]) {
* @return <code>true</code> if we have a torus
*/
public boolean hasTorus() {
for (IField probe : probes) {
if (probe instanceof TorusProbe) {
int size = probes.size();
for (int i=0; i<size; i++) {
if (probes.get(i) instanceof TorusProbe) {
return true;
}
}
Expand All @@ -135,8 +140,9 @@ public boolean hasTorus() {
* @return <code>true</code> if we have a solenoid
*/
public boolean hasSolenoid() {
for (IField probe : probes) {
if (probe instanceof SolenoidProbe) {
int size = probes.size();
for (int i=0; i<size; i++) {
if (probes.get(i) instanceof SolenoidProbe) {
return true;
}
}
Expand Down
Loading