Return-Path: Delivered-To: apmail-lucene-dev-archive@www.apache.org Received: (qmail 78916 invoked from network); 15 Mar 2011 12:23:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Mar 2011 12:23:09 -0000 Received: (qmail 26763 invoked by uid 500); 15 Mar 2011 12:23:08 -0000 Delivered-To: apmail-lucene-dev-archive@lucene.apache.org Received: (qmail 26715 invoked by uid 500); 15 Mar 2011 12:23:08 -0000 Mailing-List: contact dev-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 dev@lucene.apache.org Received: (qmail 26708 invoked by uid 99); 15 Mar 2011 12:23:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Mar 2011 12:23:08 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [74.125.82.42] (HELO mail-ww0-f42.google.com) (74.125.82.42) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Mar 2011 12:23:03 +0000 Received: by wwk4 with SMTP id 4so2782297wwk.5 for ; Tue, 15 Mar 2011 05:22:41 -0700 (PDT) MIME-Version: 1.0 Received: by 10.227.39.92 with SMTP id f28mr12335419wbe.153.1300191761591; Tue, 15 Mar 2011 05:22:41 -0700 (PDT) Received: by 10.227.10.85 with HTTP; Tue, 15 Mar 2011 05:22:41 -0700 (PDT) In-Reply-To: <20110315122004.2F01323888CB@eris.apache.org> References: <20110315122004.2F01323888CB@eris.apache.org> Date: Tue, 15 Mar 2011 08:22:41 -0400 Message-ID: Subject: Re: svn commit: r1081745 - /lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automaton/fst/TestFSTs.java From: Michael McCandless To: dev@lucene.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Looks good Dawid! On Tue, Mar 15, 2011 at 8:20 AM, wrote: > Author: dweiss > Date: Tue Mar 15 12:20:03 2011 > New Revision: 1081745 > > URL: http://svn.apache.org/viewvc?rev=3D1081745&view=3Drev > Log: > Adding -noverify and a little bit nicer output to TestFSTs. These are deb= ugging/analysis utils that are not used anywhere, so I commit them without = the patch. > > Modified: > =A0 =A0lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automaton/= fst/TestFSTs.java > > Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automat= on/fst/TestFSTs.java > URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/ap= ache/lucene/util/automaton/fst/TestFSTs.java?rev=3D1081745&r1=3D1081744&r2= =3D1081745&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automaton/fst= /TestFSTs.java (original) > +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automaton/fst= /TestFSTs.java Tue Mar 15 12:20:03 2011 > @@ -25,16 +25,7 @@ import java.io.IOException; > =A0import java.io.InputStreamReader; > =A0import java.io.OutputStreamWriter; > =A0import java.io.Writer; > -import java.util.ArrayList; > -import java.util.Arrays; > -import java.util.Collections; > -import java.util.HashMap; > -import java.util.HashSet; > -import java.util.Iterator; > -import java.util.List; > -import java.util.Map; > -import java.util.Random; > -import java.util.Set; > +import java.util.*; > > =A0import org.apache.lucene.analysis.MockAnalyzer; > =A0import org.apache.lucene.document.Document; > @@ -1098,7 +1089,7 @@ public class TestFSTs extends LuceneTest > > =A0 =A0 protected abstract T getOutput(IntsRef input, int ord) throws IOE= xception; > > - =A0 =A0public void run(int limit) throws IOException { > + =A0 =A0public void run(int limit, boolean verify) throws IOException { > =A0 =A0 =A0 BufferedReader is =3D new BufferedReader(new InputStreamReade= r(new FileInputStream(wordsFileIn), "UTF-8"), 65536); > =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 final IntsRef intsRef =3D new IntsRef(10); > @@ -1115,7 +1106,9 @@ public class TestFSTs extends LuceneTest > > =A0 =A0 =A0 =A0 =A0 ord++; > =A0 =A0 =A0 =A0 =A0 if (ord % 500000 =3D=3D 0) { > - =A0 =A0 =A0 =A0 =A0 =A0System.out.println(((System.currentTimeMillis()-= tStart)/1000.0) + "s: " + ord + "..."); > + =A0 =A0 =A0 =A0 =A0 =A0System.out.println( > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0String.format(Locale.ENGLISH, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"%6.2fs: %9d...", ((System.curre= ntTimeMillis() - tStart) / 1000.0), ord)); > =A0 =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 =A0 =A0 if (ord >=3D limit) { > =A0 =A0 =A0 =A0 =A0 =A0 break; > @@ -1144,6 +1137,10 @@ public class TestFSTs extends LuceneTest > > =A0 =A0 =A0 =A0 System.out.println("Saved FST to fst.bin."); > > + =A0 =A0 =A0 =A0if (!verify) { > + =A0 =A0 =A0 =A0 =A0System.exit(0); > + =A0 =A0 =A0 =A0} > + > =A0 =A0 =A0 =A0 System.out.println("\nNow verify..."); > > =A0 =A0 =A0 =A0 is.close(); > @@ -1194,6 +1191,7 @@ public class TestFSTs extends LuceneTest > =A0 =A0 int inputMode =3D 0; =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 // utf8 > =A0 =A0 boolean storeOrds =3D false; > =A0 =A0 boolean storeDocFreqs =3D false; > + =A0 =A0boolean verify =3D true; > =A0 =A0 while(idx < args.length) { > =A0 =A0 =A0 if (args[idx].equals("-prune")) { > =A0 =A0 =A0 =A0 prune =3D Integer.valueOf(args[1+idx]); > @@ -1215,6 +1213,9 @@ public class TestFSTs extends LuceneTest > =A0 =A0 =A0 if (args[idx].equals("-ords")) { > =A0 =A0 =A0 =A0 storeOrds =3D true; > =A0 =A0 =A0 } > + =A0 =A0 =A0if (args[idx].equals("-noverify")) { > + =A0 =A0 =A0 =A0verify =3D false; > + =A0 =A0 =A0} > =A0 =A0 =A0 idx++; > =A0 =A0 } > > @@ -1235,7 +1236,7 @@ public class TestFSTs extends LuceneTest > =A0 =A0 =A0 =A0 =A0 return new PairOutputs.Pair(o1.get(ord), > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0o2.get(_TestUtil.nextInt(rand, 1, 5000))); > =A0 =A0 =A0 =A0 } > - =A0 =A0 =A0}.run(limit); > + =A0 =A0 =A0}.run(limit, verify); > =A0 =A0 } else if (storeOrds) { > =A0 =A0 =A0 // Store only ords > =A0 =A0 =A0 final PositiveIntOutputs outputs =3D PositiveIntOutputs.getSi= ngleton(true); > @@ -1244,7 +1245,7 @@ public class TestFSTs extends LuceneTest > =A0 =A0 =A0 =A0 public Long getOutput(IntsRef input, int ord) { > =A0 =A0 =A0 =A0 =A0 return outputs.get(ord); > =A0 =A0 =A0 =A0 } > - =A0 =A0 =A0}.run(limit); > + =A0 =A0 =A0}.run(limit, verify); > =A0 =A0 } else if (storeDocFreqs) { > =A0 =A0 =A0 // Store only docFreq > =A0 =A0 =A0 final PositiveIntOutputs outputs =3D PositiveIntOutputs.getSi= ngleton(false); > @@ -1257,7 +1258,7 @@ public class TestFSTs extends LuceneTest > =A0 =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 =A0 =A0 return outputs.get(_TestUtil.nextInt(rand, 1, 5000)); > =A0 =A0 =A0 =A0 } > - =A0 =A0 =A0}.run(limit); > + =A0 =A0 =A0}.run(limit, verify); > =A0 =A0 } else { > =A0 =A0 =A0 // Store nothing > =A0 =A0 =A0 final NoOutputs outputs =3D NoOutputs.getSingleton(); > @@ -1267,7 +1268,7 @@ public class TestFSTs extends LuceneTest > =A0 =A0 =A0 =A0 public Object getOutput(IntsRef input, int ord) { > =A0 =A0 =A0 =A0 =A0 return NO_OUTPUT; > =A0 =A0 =A0 =A0 } > - =A0 =A0 =A0}.run(limit); > + =A0 =A0 =A0}.run(limit, verify); > =A0 =A0 } > =A0 } > > > > --=20 Mike http://blog.mikemccandless.com --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org For additional commands, e-mail: dev-help@lucene.apache.org