Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C1731175F for ; Tue, 1 Jul 2014 16:51:07 +0000 (UTC) Received: (qmail 65784 invoked by uid 500); 1 Jul 2014 16:51:07 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 65775 invoked by uid 99); 1 Jul 2014 16:51:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jul 2014 16:51:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jul 2014 16:51:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D7159238899C; Tue, 1 Jul 2014 16:50:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1607138 - in /lucene/dev/branches/branch_4x/lucene/core/src: java/org/apache/lucene/util/automaton/Operations.java test/org/apache/lucene/util/automaton/TestOperations.java Date: Tue, 01 Jul 2014 16:50:43 -0000 To: commits@lucene.apache.org From: rmuir@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140701165043.D7159238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Tue Jul 1 16:50:43 2014 New Revision: 1607138 URL: http://svn.apache.org/r1607138 Log: remove dead states after union(), just like intersection() and complement() do Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java?rev=1607138&r1=1607137&r2=1607138&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java (original) +++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java Tue Jul 1 16:50:43 2014 @@ -505,7 +505,7 @@ final public class Operations { result.finishState(); - return result; + return removeDeadStates(result); } // Simple custom ArrayList Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java?rev=1607138&r1=1607137&r2=1607138&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java (original) +++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java Tue Jul 1 16:50:43 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 strings) {