lorenz.stechauner/EP2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix AB6, code style

Browse Source
This commit is contained in:
Lorenz Stechauner
2022-06-02 14:28:43 +02:00
parent eab0db8e40
commit d718ba90e3
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/HierarchicalSystem.java
View File

@ -138,15 +138,13 @@ public class HierarchicalSystem implements CosmicSystem, MassiveIterable {
public Massive next() { public Massive next() {
if (cur != null && cur.hasNext()) return cur.next(); if (cur != null && cur.hasNext()) return cur.next();
for (; i < all.length; i++) { while (i < all.length) {
CosmicSystem sys = all[i]; CosmicSystem sys = all[i++];
if (sys instanceof NamedBodyForcePair m) { if (sys instanceof NamedBodyForcePair m) {
i++;
return m.getBody(); return m.getBody();
} else if (sys instanceof HierarchicalSystem hs) { } else if (sys instanceof HierarchicalSystem hs) {
cur = hs.iterator(); cur = hs.iterator();
if (cur.hasNext()) { if (cur.hasNext()) {
i++;
return cur.next(); return cur.next();
} }
} }
@ -159,14 +157,14 @@ public class HierarchicalSystem implements CosmicSystem, MassiveIterable {
public boolean hasNext() { public boolean hasNext() {
if (cur != null && cur.hasNext()) return true; if (cur != null && cur.hasNext()) return true;
for (; i < all.length; i++) { while (i < all.length) {
CosmicSystem sys = all[i]; CosmicSystem sys = all[i];
if (sys instanceof NamedBodyForcePair) { if (sys instanceof NamedBodyForcePair) return true;
return true; i++;
} else if (sys instanceof HierarchicalSystem hs) {
if (sys instanceof HierarchicalSystem hs) {
cur = hs.iterator(); cur = hs.iterator();
if (cur.hasNext()) { if (cur.hasNext()) {
i++;
return true; return true;
} }
} }