From f03a8049cd09119826f4673a171b06a07d152574 Mon Sep 17 00:00:00 2001 From: Valerio Maggio Date: Sat, 20 May 2023 13:58:38 +0100 Subject: [PATCH] Adding Pauper in the stop-words list All supported format names in stopwords have been grouped into a constant for easy update and re-use. --- .../src/main/java/forge/lda/LDAModelGenetrator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java index c597aa5099a..dda6cf5f6fd 100644 --- a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java +++ b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java @@ -38,6 +38,7 @@ import static forge.lda.lda.inference.InferenceMethod.CGS; */ public final class LDAModelGenetrator { + public static final String SUPPORTED_LDA_FORMATS = "Historic|Modern|Pioneer|Standard|Legacy|Vintage|Pauper"; public static Map>>>> ldaPools = new HashMap<>(); public static Map> ldaArchetypes = new HashMap<>(); @@ -167,7 +168,6 @@ public final class LDAModelGenetrator { public static List initializeFormat(GameFormat format) throws Exception{ Dataset dataset = new Dataset(format); - //estimate number of topics to attempt to find using power law final int numTopics = Float.valueOf(347f*dataset.getNumDocs()/(2892f + dataset.getNumDocs())).intValue(); System.out.println("Num Topics = " + numTopics); @@ -223,8 +223,8 @@ public final class LDAModelGenetrator { } LinkedHashMap wordCounts = new LinkedHashMap<>(); for( Deck deck: decks){ - String name = deck.getName().replaceAll(".* Version - ","").replaceAll(" \\((Historic|Modern|Pioneer|Standard|Legacy|Vintage), #[0-9]+\\)",""); - name = name.replaceAll("\\(Historic|Modern|Pioneer|Standard|Legacy|Vintage|Fuck|Shit|Cunt\\)",""); + String name = deck.getName().replaceAll(".* Version - ","").replaceAll(" \\((" + SUPPORTED_LDA_FORMATS + "), #[0-9]+\\)",""); + name = name.replaceAll("\\(" + SUPPORTED_LDA_FORMATS + "|Fuck|Shit|Cunt|Ass|Arse|Dick|Pussy\\)",""); String[] tokens = name.split(" "); for(String rawtoken: tokens){ String token = rawtoken.toLowerCase(); @@ -256,7 +256,7 @@ public final class LDAModelGenetrator { System.out.println("============ " + deckName); System.out.println(decks.toString()); - unfilteredTopics.add(new Archetype(topRankVocabs,deckName,decks.size())); + unfilteredTopics.add(new Archetype(topRankVocabs, deckName, decks.size())); } Comparator archetypeComparator = new Comparator() { @Override @@ -376,7 +376,7 @@ public final class LDAModelGenetrator { int old = matrix[legendIntegerMap.get(legend.getName())][cardIntegerMap.get(pairCard.getName())]; matrix[legendIntegerMap.get(legend.getName())][cardIntegerMap.get(pairCard.getName())] = old + 1; }catch (NullPointerException ne){ - //Todo: Not sure what was failing here + //TODO: Not sure what was failing here ne.printStackTrace(); } }