From 4528223dee750f5c54dfa90dac525278e0414da9 Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Sun, 11 Apr 2021 23:07:36 +0100 Subject: [PATCH 1/5] Initial basic fix for LDA module to ensure it builds without errors - also removed some unneeded imports which the Maven checks were blocking on --- .../src/main/java/forge/ai/GameState.java | 2 - .../src/main/java/forge/deck/CardPool.java | 3 ++ .../limited/ArchetypeDeckBuilder.java | 1 - forge-lda/pom.xml | 46 ++++++++++++++++--- .../java/forge/lda/LDAModelGenetrator.java | 5 +- 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java index 4f42e2b7579..bc31f46fb98 100644 --- a/forge-ai/src/main/java/forge/ai/GameState.java +++ b/forge-ai/src/main/java/forge/ai/GameState.java @@ -16,7 +16,6 @@ import forge.game.Game; import forge.game.GameEntity; import forge.game.GameObject; import forge.game.ability.AbilityFactory; -import forge.game.ability.AbilityKey; import forge.game.ability.effects.DetachedCardEffect; import forge.game.card.Card; import forge.game.card.CardCloneStates; @@ -34,7 +33,6 @@ import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.spellability.AbilityManaPart; import forge.game.spellability.SpellAbility; -import forge.game.trigger.TriggerType; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.item.IPaperCard; diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index 3e27cb17ed7..b1a7a767490 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -77,6 +77,9 @@ public class CardPool extends ItemPool { public void add(String cardName, String setCode, final int artIndex, final int amount) { PaperCard paperCard = StaticData.instance().getCommonCards().getCard(cardName, setCode, artIndex); + if (paperCard == null) { + paperCard = StaticData.instance().getCommonCards().getCard(cardName.split(" // ")[0], setCode, artIndex); + } final boolean isCommonCard = paperCard != null; if (!isCommonCard) { diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/ArchetypeDeckBuilder.java b/forge-gui/src/main/java/forge/gamemodes/limited/ArchetypeDeckBuilder.java index 2b8a6da3c9f..098ed65da1c 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/ArchetypeDeckBuilder.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/ArchetypeDeckBuilder.java @@ -8,7 +8,6 @@ import forge.deck.io.Archetype; import forge.game.GameFormat; import forge.item.PaperCard; import forge.model.FModel; -import forge.util.MyRandom; import org.apache.commons.lang3.tuple.Pair; public class ArchetypeDeckBuilder extends CardThemedDeckBuilder{ diff --git a/forge-lda/pom.xml b/forge-lda/pom.xml index bdda207b546..1991969fa2a 100644 --- a/forge-lda/pom.xml +++ b/forge-lda/pom.xml @@ -12,12 +12,45 @@ Forge LDA - 0 - 0 - 0 + 1.6.39.001 + + src + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + filters + true + + + forge-lda-${alpha-version} + + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + forge + forge-ai + ${project.version} + forge forge-gui @@ -29,9 +62,10 @@ 3.8.1 - org.apache.commons - commons-math3 - 3.6.1 + forge + forge-gui-desktop + 1.6.40-SNAPSHOT + compile \ No newline at end of file diff --git a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java index 1e0ce8b9202..677cf66cfb7 100644 --- a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java +++ b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java @@ -6,7 +6,7 @@ import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -//import forge.GuiDesktop; +import forge.GuiDesktop; import forge.StaticData; import forge.card.CardRules; import forge.card.CardRulesPredicates; @@ -15,6 +15,7 @@ import forge.deck.DeckFormat; import forge.deck.io.Archetype; import forge.deck.io.CardThemedLDAIO; import forge.deck.io.DeckStorage; +import forge.gui.GuiBase; import forge.lda.dataset.Dataset; import forge.lda.lda.LDA; import forge.game.GameFormat; @@ -42,7 +43,7 @@ public final class LDAModelGenetrator { public static final void main(String[] args){ - //GuiBase.setInterface(new GuiDesktop()); + GuiBase.setInterface(new GuiDesktop()); FModel.initialize(null, new Function() { @Override public Void apply(ForgePreferences preferences) { From 352c5ea3d3251b76a37df5df52f8a7815d910153 Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Mon, 12 Apr 2021 13:36:01 +0100 Subject: [PATCH 2/5] Corrected version in pom --- forge-lda/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-lda/pom.xml b/forge-lda/pom.xml index 1991969fa2a..45d62587044 100644 --- a/forge-lda/pom.xml +++ b/forge-lda/pom.xml @@ -64,7 +64,7 @@ forge forge-gui-desktop - 1.6.40-SNAPSHOT + ${project.version} compile From 76140fb55500a1231491c0cc51672e1e12eae1eb Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Mon, 12 Apr 2021 13:37:54 +0100 Subject: [PATCH 3/5] Reverted accidental test change --- forge-core/src/main/java/forge/deck/CardPool.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index b1a7a767490..3e27cb17ed7 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -77,9 +77,6 @@ public class CardPool extends ItemPool { public void add(String cardName, String setCode, final int artIndex, final int amount) { PaperCard paperCard = StaticData.instance().getCommonCards().getCard(cardName, setCode, artIndex); - if (paperCard == null) { - paperCard = StaticData.instance().getCommonCards().getCard(cardName.split(" // ")[0], setCode, artIndex); - } final boolean isCommonCard = paperCard != null; if (!isCommonCard) { From cdaa37c5fd9c5344e24178a5847397dad591fac2 Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Sun, 11 Apr 2021 23:07:36 +0100 Subject: [PATCH 4/5] Initial basic fix for LDA module to ensure it builds without errors - also removed some unneeded imports which the Maven checks were blocking on --- forge-core/src/main/java/forge/deck/CardPool.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index 3e27cb17ed7..b1a7a767490 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -77,6 +77,9 @@ public class CardPool extends ItemPool { public void add(String cardName, String setCode, final int artIndex, final int amount) { PaperCard paperCard = StaticData.instance().getCommonCards().getCard(cardName, setCode, artIndex); + if (paperCard == null) { + paperCard = StaticData.instance().getCommonCards().getCard(cardName.split(" // ")[0], setCode, artIndex); + } final boolean isCommonCard = paperCard != null; if (!isCommonCard) { From 78762cd479af35e7e5a42c862423648076de916d Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Mon, 12 Apr 2021 13:40:44 +0100 Subject: [PATCH 5/5] Reverted accidental test change --- forge-core/src/main/java/forge/deck/CardPool.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index b1a7a767490..3e27cb17ed7 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -77,9 +77,6 @@ public class CardPool extends ItemPool { public void add(String cardName, String setCode, final int artIndex, final int amount) { PaperCard paperCard = StaticData.instance().getCommonCards().getCard(cardName, setCode, artIndex); - if (paperCard == null) { - paperCard = StaticData.instance().getCommonCards().getCard(cardName.split(" // ")[0], setCode, artIndex); - } final boolean isCommonCard = paperCard != null; if (!isCommonCard) {