1.1 --- a/doc-src/Sledgehammer/sledgehammer.tex	Tue Aug 09 17:33:17 2011 +0200
     1.2 +++ b/doc-src/Sledgehammer/sledgehammer.tex	Tue Aug 09 17:33:17 2011 +0200
     1.3 @@ -140,10 +140,10 @@
     1.4  
     1.5  \subsection{Installing ATPs}
     1.6  
     1.7 -Currently, E, SPASS, and Vampire can be run locally; in addition, E, E-SInE,
     1.8 -E-ToFoF, LEO-II, Satallax, SNARK, Waldmeister, and Vampire are available
     1.9 -remotely via System\-On\-TPTP \cite{sutcliffe-2000}. If you want better
    1.10 -performance, you should at least install E and SPASS locally.
    1.11 +Currently, E, LEO-II, Satallax, SPASS, and Vampire can be run locally; in
    1.12 +addition, E, E-SInE, E-ToFoF, LEO-II, Satallax, SNARK, Waldmeister, and Vampire
    1.13 +are available remotely via System\-On\-TPTP \cite{sutcliffe-2000}. If you want
    1.14 +better performance, you should at least install E and SPASS locally.
    1.15  
    1.16  There are three main ways to install ATPs on your machine:
    1.17  
    1.18 @@ -524,7 +524,7 @@
    1.19  it took to find it or replay it).
    1.20  
    1.21  In addition, some provers (notably CVC3, Satallax, and Yices) do not provide
    1.22 -proofs or sometimes provide incomplete proofs. The minimizer is then invoked to
    1.23 +proofs or sometimes produce incomplete proofs. The minimizer is then invoked to
    1.24  find out which facts are actually needed from the (large) set of facts that was
    1.25  initinally given to the prover. Finally, if a prover returns a proof with lots
    1.26  of facts, the minimizer is invoked automatically since Metis would be unlikely
    1.27 @@ -722,6 +722,23 @@
    1.28  executable, or install the prebuilt E package from Isabelle's download page. See
    1.29  \S\ref{installation} for details.
    1.30  
    1.31 +\item[$\bullet$] \textbf{\textit{leo2}:} LEO-II is an automatic
    1.32 +higher-order prover developed by Christoph Benzm\"uller et al.\ \cite{leo2},
    1.33 +with support for the TPTP higher-order syntax (THF).
    1.34 +
    1.35 +\item[$\bullet$] \textbf{\textit{metis}:} Although it is much less powerful than
    1.36 +the external provers, Metis itself can be used for proof search.
    1.37 +
    1.38 +\item[$\bullet$] \textbf{\textit{metis\_full\_types}:} Fully typed version of
    1.39 +Metis, corresponding to \textit{metis} (\textit{full\_types}).
    1.40 +
    1.41 +\item[$\bullet$] \textbf{\textit{metis\_no\_types}:} Untyped version of Metis,
    1.42 +corresponding to \textit{metis} (\textit{no\_types}).
    1.43 +
    1.44 +\item[$\bullet$] \textbf{\textit{satallax}:} Satallax is an automatic
    1.45 +higher-order prover developed by Chad Brown et al.\ \cite{satallax}, with
    1.46 +support for the TPTP higher-order syntax (THF).
    1.47 +
    1.48  \item[$\bullet$] \textbf{\textit{spass}:} SPASS is a first-order resolution
    1.49  prover developed by Christoph Weidenbach et al.\ \cite{weidenbach-et-al-2009}.
    1.50  To use SPASS, set the environment variable \texttt{SPASS\_HOME} to the directory
    1.51 @@ -729,17 +746,17 @@
    1.52  package from Isabelle's download page. Sledgehammer requires version 3.5 or
    1.53  above. See \S\ref{installation} for details.
    1.54  
    1.55 -\item[$\bullet$] \textbf{\textit{yices}:} Yices is an SMT solver developed at
    1.56 -SRI \cite{yices}. To use Yices, set the environment variable
    1.57 -\texttt{YICES\_SOLVER} to the complete path of the executable, including the
    1.58 -file name. Sledgehammer has been tested with version 1.0.
    1.59 -
    1.60  \item[$\bullet$] \textbf{\textit{vampire}:} Vampire is a first-order resolution
    1.61  prover developed by Andrei Voronkov and his colleagues
    1.62  \cite{riazanov-voronkov-2002}. To use Vampire, set the environment variable
    1.63  \texttt{VAMPIRE\_HOME} to the directory that contains the \texttt{vampire}
    1.64  executable. Sledgehammer has been tested with versions 11, 0.6, and 1.0.
    1.65  
    1.66 +\item[$\bullet$] \textbf{\textit{yices}:} Yices is an SMT solver developed at
    1.67 +SRI \cite{yices}. To use Yices, set the environment variable
    1.68 +\texttt{YICES\_SOLVER} to the complete path of the executable, including the
    1.69 +file name. Sledgehammer has been tested with version 1.0.
    1.70 +
    1.71  \item[$\bullet$] \textbf{\textit{z3}:} Z3 is an SMT solver developed at
    1.72  Microsoft Research \cite{z3}. To use Z3, set the environment variable
    1.73  \texttt{Z3\_SOLVER} to the complete path of the executable, including the file
    1.74 @@ -749,15 +766,6 @@
    1.75  \item[$\bullet$] \textbf{\textit{z3\_atp}:} This version of Z3 pretends to be an
    1.76  ATP, exploiting Z3's undocumented support for the TPTP format. It is included
    1.77  for experimental purposes. It requires version 2.18 or above.
    1.78 -
    1.79 -\item[$\bullet$] \textbf{\textit{metis}:} Although it is much less powerful than
    1.80 -the external provers, Metis itself can be used for proof search.
    1.81 -
    1.82 -\item[$\bullet$] \textbf{\textit{metis\_full\_types}:} Fully typed version of
    1.83 -Metis, corresponding to \textit{metis} (\textit{full\_types}).
    1.84 -
    1.85 -\item[$\bullet$] \textbf{\textit{metis\_no\_types}:} Untyped version of Metis,
    1.86 -corresponding to \textit{metis} (\textit{no\_types}).
    1.87  \end{enum}
    1.88  
    1.89  In addition, the following remote provers are supported:
    1.90 @@ -779,17 +787,11 @@
    1.91  servers. This ATP supports the TPTP many-typed first-order format (TFF). The
    1.92  remote version of E-ToFoF runs on Geoff Sutcliffe's Miami servers.
    1.93  
    1.94 -\item[$\bullet$] \textbf{\textit{remote\_leo2}:} LEO-II is an automatic
    1.95 -higher-order prover developed by Christoph Benzm\"uller et al.\ \cite{leo2},
    1.96 -with support for the TPTP higher-order syntax (THF). The remote version of
    1.97 -LEO-II runs on Geoff Sutcliffe's Miami servers. In the current setup, the
    1.98 -problems given to LEO-II are only mildly higher-order.
    1.99 +\item[$\bullet$] \textbf{\textit{remote\_leo2}:} The remote version of LEO-II
   1.100 +runs on Geoff Sutcliffe's Miami servers \cite{sutcliffe-2000}.
   1.101  
   1.102 -\item[$\bullet$] \textbf{\textit{remote\_satallax}:} Satallax is an automatic
   1.103 -higher-order prover developed by Chad Brown et al.\ \cite{satallax}, with
   1.104 -support for the TPTP higher-order syntax (THF). The remote version of Satallax
   1.105 -runs on Geoff Sutcliffe's Miami servers. In the current setup, the problems
   1.106 -given to Satallax are only mildly higher-order.
   1.107 +\item[$\bullet$] \textbf{\textit{remote\_satallax}:} The remote version of
   1.108 +Satallax runs on Geoff Sutcliffe's Miami servers \cite{sutcliffe-2000}.
   1.109  
   1.110  \item[$\bullet$] \textbf{\textit{remote\_snark}:} SNARK is a first-order
   1.111  resolution prover developed by Stickel et al.\ \cite{snark}. It supports the