From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>
---
src/net/sf/freecol/common/model/ResourceType.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/net/sf/freecol/common/model/ResourceType.java
b/src/net/sf/freecol/common/model/ResourceType.java
index 923c81726b8..b2c4ced928b 100644
--- a/src/net/sf/freecol/common/model/ResourceType.java
+++ b/src/net/sf/freecol/common/model/ResourceType.java
@@ -76,10 +76,17 @@ public final class ResourceType extends
FreeColSpecObjectType {
*/
public GoodsType getBestGoodsType() {
final Specification spec = getSpecification();
- final Comparator<Modifier> comp = cachingDoubleComparator(m ->
- spec.getInitialPrice(spec.getGoodsType(m.getId()))
- * (double)m.applyTo(100));
- Modifier best = maximize(getModifiers(), comp);
+ int best_price = 0;
+ Modifier best = null;
+ for (Modifier m : getModifiers()) {
+ int p = spec.getInitialPrice(spec.getGoodsType(m.getId()))
+ * (int)m.applyTo(100);
+ if (best == null || best_price < p) {
+ best = m;
+ best_price = p;
+ }
+ }
+
return (best == null) ? null : spec.getGoodsType(best.getId());
}
--
2.11.0.rc0.7.gbe5a750
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
