Some options handling streamlining in TrieClassify and JavaTrieClassify.

antononcube · Apr 10, 2018 · bf0e3b2 · bf0e3b2
1 parent c8d9384
commit bf0e3b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/JavaTriesWithFrequencies.m b/JavaTriesWithFrequencies.m
@@ -503,13 +503,13 @@ Mathematica is (C) Copyright 1988-2017 Wolfram Research, Inc.
 Options[JavaTrieClassify] := {"Default" -> None};
 
 JavaTrieClassify[tr_, record_, opts : OptionsPattern[]] :=
-    JavaTrieClassify[tr, record, "Decision", opts];
+    JavaTrieClassify[tr, record, "Decision", opts] /; FreeQ[{opts}, "Probability"|"TopProbabilities"];
 
 JavaTrieClassify[tr_, record_, "Decision", opts : OptionsPattern[]] :=
     First@Keys@JavaTrieClassify[tr, record, "Probabilities", opts];
 
-JavaTrieClassify[tr_, record_, "Probability" -> class_] :=
-    Lookup[JavaTrieClassify[tr, record, "Probabilities"], class, 0];
+JavaTrieClassify[tr_, record_, "Probability" -> class_, opts : OptionsPattern[]] :=
+    Lookup[JavaTrieClassify[tr, record, "Probabilities", opts], class, 0];
 
 JavaTrieClassify[tr_, record_, "TopProbabilities", opts : OptionsPattern[]] :=
     Select[JavaTrieClassify[tr, record, "Probabilities", opts], # > 0 &];
@@ -530,7 +530,7 @@ Mathematica is (C) Copyright 1988-2017 Wolfram Research, Inc.
     First @* Keys @* TakeLargest[1] /@ JavaTrieClassify[tr, records, "Probabilities", opts];
 
 JavaTrieClassify[tr_, records:(_Dataset|{_List..}), "Probability" -> class_, opts : OptionsPattern[]] :=
-    Map[Lookup[#, class, 0]&, JavaTrieClassify[tr, records, "Probabilities"] ];
+    Map[Lookup[#, class, 0]&, JavaTrieClassify[tr, records, "Probabilities", opts] ];
 
 JavaTrieClassify[tr_, records:(_Dataset|{_List..}), "TopProbabilities", opts : OptionsPattern[]] :=
     Map[ Select[#, # > 0 &]&, JavaTrieClassify[tr, records, "Probabilities", opts] ];

diff --git a/TriesWithFrequencies.m b/TriesWithFrequencies.m
@@ -579,7 +579,7 @@ Mathematica is (C) Copyright 1988-2016 Wolfram Research, Inc.
     First@Keys@TrieClassify[tr, record, "Probabilities", opts];
 
 TrieClassify[tr_, record_, "Probability" -> class_, opts : OptionsPattern[]] :=
-    Lookup[TrieClassify[tr, record, "Probabilities"], class, 0];
+    Lookup[TrieClassify[tr, record, "Probabilities", opts], class, 0];
 
 TrieClassify[tr_, record_, "TopProbabilities", opts : OptionsPattern[]] :=
     Select[TrieClassify[tr, record, "Probabilities", opts], # > 0 &];
@@ -600,7 +600,7 @@ Mathematica is (C) Copyright 1988-2016 Wolfram Research, Inc.
     First @* Keys @* TakeLargest[1] /@ TrieClassify[tr, records, "Probabilities", opts];
 
 TrieClassify[tr_, records:(_Dataset|{_List..}), "Probability" -> class_, opts : OptionsPattern[]] :=
-    Map[Lookup[#, class, 0]&, TrieClassify[tr, records, "Probabilities"] ];
+    Map[Lookup[#, class, 0]&, TrieClassify[tr, records, "Probabilities", opts] ];
 
 TrieClassify[tr_, records:(_Dataset|{_List..}), "TopProbabilities", opts : OptionsPattern[]] :=
     Map[ Select[#, # > 0 &]&, TrieClassify[tr, records, "Probabilities", opts] ];