Extended the signature of JavaTrieRandomChoice to resemble RandomChoice.

antononcube · Feb 14, 2017 · 8577bf6 · 8577bf6
1 parent 973d869
commit 8577bf6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/JavaTriesWithFrequencies.m b/JavaTriesWithFrequencies.m
@@ -385,8 +385,12 @@ Mathematica is (C) Copyright 1988-2017 Wolfram Research, Inc.
     TrieFunctions`removeByParetoFraction[jTr, paretoFraction, True, postfix];
 
 Clear[JavaTrieRandomChoice]
-JavaTrieRandomChoice[jTr_?JavaObjectQ, weightedQ:(True|False):True] :=
-    JavaObjectToExpression[ TrieFunctions`randomChoice[jTr, weightedQ] ];
+Options[JavaTrieRandomChoice] = { "Weighted"->True };
+JavaTrieRandomChoice[jTr_?JavaObjectQ, opts:OptionsPattern[] ] :=
+    JavaObjectToExpression[ TrieFunctions`randomChoice[jTr, TrueQ[OptionValue["Weighted"]] ] ];
+
+JavaTrieRandomChoice[jTr_?JavaObjectQ, n_Integer, opts:OptionsPattern[] ] :=
+    JavaObjectToExpression /@ JavaObjectToExpression[ TrieFunctions`randomChoice[jTr, n, TrueQ[OptionValue["Weighted"]] ] ];
 
 Clear[JSONTrieToRules]
 JSONTrieToRules[tree_] := Block[{ORDER = 0}, JSONTrieToRules[tree, 0, 0]];