David McClosky avatar David McClosky committed acca2e3

Make cvlm-owlqn the default estimator. As a result, README now says that Petsc/Tao are optional.

Comments (0)

Files changed (2)

 # perceptron).  If you decide to use a different feature weight
 # estimator you should also change ESTIMATORNICKNAME below.
 #
-ESTIMATOR=second-stage/programs/wlle/cvlm
+ESTIMATOR=second-stage/programs/wlle/cvlm-owlqn
 
 # ESTIMATORFLAGS are flags given to the estimator
 #
-ESTIMATORFLAGS=-l 1 -c0 10 -Pyx_factor 1 -debug 10 -ns -1
+# These flags are for cvlm-owlqn:
+ESTIMATORFLAGS=-l 1 -c 10 -F 1 -d 10 -n -1
+# The equivalent ESTIMATORFLAGS for cvlm:
+#   ESTIMATORFLAGS=-l 1 -c0 10 -Pyx_factor 1 -debug 10 -ns -1
 
 # ESTIMATORNICKNAME is used to name the feature weights file
 #
 
 PENNWSJTREEBANK=/usr/local/data/Penn3/parsed/mrg/wsj/
 
-You'll also need the Boost C++ and the Petsc/Tao C++ libraries in
-order to retrain the reranker.  The environment variables PETSC_DIR
-and TAO_DIR should all point to the installation directories of this
-software.  I define these variables in my .login file as follows on my
-machine.
+If you're using cvlm as your estimator (note that this is no longer the
+default), you'll also need the Boost C++ and the Petsc/Tao C++ libraries
+in order to retrain the reranker.  If you're using cvlm-owlqn as your
+estimator, you can ignore these steps.  Install instructions for Petsc/Tao
+are given later in this document.  The environment variables PETSC_DIR and
+TAO_DIR should all point to the installation directories of this software.
+I define these variables in my .login file as follows on my machine.
 
 setenv PETSC_DIR /usr/local/share/petsc
 setenv TAO_DIR /usr/local/share/tao
 INSTALLING PETSC AND TAO
 ========================
 
-You'll need to have PETSc and Tao installed in order to 
-retrain the reranker.
+If you're using cvlm as your estimator, you'll need to have PETSc and
+Tao installed in order to retrain the reranker.  Otherwise, you can
+safely ignore this section.
 
 These installation instructions work for gcc version 4.2.1 (you also
 need g++ and gfortran).
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.