jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Fix incorrect combineMax implementation (fixes #299)

This commit is contained in:
Sam Harwell 2014-01-16 20:34:34 -06:00
parent 9889de87ac
commit 664d66d937
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tool/src/org/antlr/v4/codegen/model/RuleFunction.java
View File

@ -307,13 +307,23 @@ public class RuleFunction extends OutputModelObject {
* Common * Common
*/ */
/**
* Generate a frequency set as the union of two input sets. If an
* element is contained in both sets, the value for the output will be
* the maximum of the two input values.
*
* @param a The first set.
* @param b The second set.
* @return The union of the two sets, with the maximum value chosen
* whenever both sets contain the same key.
*/
protected static FrequencySet<String> combineMax(FrequencySet<String> a, FrequencySet<String> b) { protected static FrequencySet<String> combineMax(FrequencySet<String> a, FrequencySet<String> b) {
FrequencySet<String> result = combineAndClip(a, b, 1); FrequencySet<String> result = combineAndClip(a, b, 1);
for (Map.Entry<String, MutableInt> entry : a.entrySet()) { for (Map.Entry<String, MutableInt> entry : a.entrySet()) {
result.get(entry.getKey()).v = entry.getValue().v; result.get(entry.getKey()).v = entry.getValue().v;
} }
for (Map.Entry<String, MutableInt> entry : a.entrySet()) { for (Map.Entry<String, MutableInt> entry : b.entrySet()) {
MutableInt slot = result.get(entry.getKey()); MutableInt slot = result.get(entry.getKey());
slot.v = Math.max(slot.v, entry.getValue().v); slot.v = Math.max(slot.v, entry.getValue().v);
} }
@ -321,6 +331,18 @@ public class RuleFunction extends OutputModelObject {
return result; return result;
} }
/**
* Generate a frequency set as the union of two input sets, with the
* values clipped to a specified maximum value. If an element is
* contained in both sets, the value for the output, prior to clipping,
* will be the sum of the two input values.
*
* @param a The first set.
* @param b The second set.
* @param clip The maximum value to allow for any output.
* @return The sum of the two sets, with the individual elements clipped
* to the maximum value gived by {@code clip}.
*/
protected static FrequencySet<String> combineAndClip(FrequencySet<String> a, FrequencySet<String> b, int clip) { protected static FrequencySet<String> combineAndClip(FrequencySet<String> a, FrequencySet<String> b, int clip) {
FrequencySet<String> result = new FrequencySet<String>(); FrequencySet<String> result = new FrequencySet<String>();
for (Map.Entry<String, MutableInt> entry : a.entrySet()) { for (Map.Entry<String, MutableInt> entry : a.entrySet()) {