You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/07/01 18:52:21 UTC
svn commit: r1607139 - in /lucene/dev/trunk: ./ lucene/ lucene/core/
lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java
lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java
Author: rmuir
Date: Tue Jul 1 16:52:20 2014
New Revision: 1607139
URL: http://svn.apache.org/r1607139
Log:
remove dead states after union(), just like intersection() and complement() do
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/core/ (props changed)
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java?rev=1607139&r1=1607138&r2=1607139&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java Tue Jul 1 16:52:20 2014
@@ -505,7 +505,7 @@ final public class Operations {
result.finishState();
- return result;
+ return removeDeadStates(result);
}
// Simple custom ArrayList<Transition>
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java?rev=1607139&r1=1607138&r2=1607139&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java Tue Jul 1 16:52:20 2014
@@ -34,7 +34,14 @@ public class TestOperations extends Luce
Collections.sort(strings);
Automaton union = Automata.makeStringUnion(strings);
assertTrue(union.isDeterministic());
- assertTrue(Operations.sameLanguage(union, naiveUnion(strings)));
+ assertFalse(Operations.hasDeadStatesFromInitial(union));
+
+ Automaton naiveUnion = naiveUnion(strings);
+ assertTrue(naiveUnion.isDeterministic());
+ assertFalse(Operations.hasDeadStatesFromInitial(naiveUnion));
+
+
+ assertTrue(Operations.sameLanguage(union, naiveUnion));
}
private static Automaton naiveUnion(List<BytesRef> strings) {