hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't compare aoa and recovery speed in warning equals

Browse Source 
This caused a lot of duplicate warnings in the simulations
This commit is contained in:
SiboVG 2024-02-16 01:24:23 +01:00
parent 13f47a755d
commit 921124e337
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/logging/Warning.java
View File

@ -2,7 +2,6 @@ package net.sf.openrocket.logging;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.simulation.FlightEvent; import net.sf.openrocket.simulation.FlightEvent;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
@ -73,10 +72,11 @@ public abstract class Warning extends Message {
return (o.aoa > this.aoa); return (o.aoa > this.aoa);
} }
@Override // Don't compare aoa, otherwise you have a million LargeAOA warnings with different values
/*@Override
public boolean equals(Object o) { public boolean equals(Object o) {
return super.equals(o) && Double.compare(((LargeAOA) o).aoa, aoa) == 0; return super.equals(o) && Double.compare(((LargeAOA) o).aoa, aoa) == 0;
} }*/
@Override @Override
protected Object clone() throws CloneNotSupportedException { protected Object clone() throws CloneNotSupportedException {
@ -117,10 +117,11 @@ public abstract class Warning extends Message {
return false; return false;
} }
@Override // Don't compare recoverySpeed, otherwise you have a million HighSpeedDeployment warnings with different values
/*@Override
public boolean equals(Object o) { public boolean equals(Object o) {
return super.equals(o) && Double.compare(((HighSpeedDeployment) o).recoverySpeed, recoverySpeed) == 0; return super.equals(o) && Double.compare(((HighSpeedDeployment) o).recoverySpeed, recoverySpeed) == 0;
} }*/
@Override @Override
protected Object clone() throws CloneNotSupportedException { protected Object clone() throws CloneNotSupportedException {