# HG changeset patch
# User blanchet
# Date 1405526247 -7200
# Node ID 0fb191472e4a85e6cf0c5286c0a9e736aa31cbda
# Parent  ab7f391145077c3bbace34cef3c4022ba9afcd1f
disabled MaSh for the Isabelle2014 release, due to a couple of issues

diff -r ab7f39114507 -r 0fb191472e4a src/Doc/Sledgehammer/document/root.tex
--- a/src/Doc/Sledgehammer/document/root.tex	Wed Jul 16 10:22:06 2014 +0200
+++ b/src/Doc/Sledgehammer/document/root.tex	Wed Jul 16 17:57:27 2014 +0200
@@ -1064,15 +1064,14 @@
 \item[\labelitemi] \textbf{\textit{knn}} is an implementation of $k$-nearest
 neighbors.
 
-\item[\labelitemi] \textbf{\textit{nb\_knn}} (also called \textbf{\textit{yes}}
-and \textbf{\textit{sml}}) is a combination of naive Bayes and $k$-nearest
-neighbors.
+\item[\labelitemi] \textbf{\textit{nb\_knn}} (also called \textbf{\textit{yes}})
+is a combination of naive Bayes and $k$-nearest neighbors.
 \end{enum}
 
 In addition, the special value \textit{none} is used to disable machine learning by
 default (cf.\ \textit{smart} below).
 
-The default algorithm is \textit{nb\_knn}. The algorithm can be selected by
+The default algorithm is \textit{none}. The algorithm can be selected by
 setting \texttt{MASH}---either in the environment in which Isabelle is launched,
 in your
 \texttt{\$ISABELLE\_\allowbreak HOME\_\allowbreak USER/\allowbreak etc/\allowbreak settings}
@@ -1084,9 +1083,9 @@
 \item[\labelitemi] \textbf{\textit{mesh}:} The MeSh filter, which combines the
 rankings from MePo and MaSh.
 
-\item[\labelitemi] \textbf{\textit{smart}:} A combination of MePo, MaSh, and
-MeSh. If the learning algorithm is set to be \textit{none}, \textit{smart}
-behaves like MePo.
+\item[\labelitemi] \textbf{\textit{smart}:}
+If the learning algorithm is set to be \textit{none} (the default), \textit{smart}
+behaves like MePo; otherwise, it combines MePo, MaSh, and MeSh.
 \end{enum}
 
 \opdefault{max\_facts}{smart\_int}{smart}
diff -r ab7f39114507 -r 0fb191472e4a src/HOL/Tools/etc/options
--- a/src/HOL/Tools/etc/options	Wed Jul 16 10:22:06 2014 +0200
+++ b/src/HOL/Tools/etc/options	Wed Jul 16 17:57:27 2014 +0200
@@ -35,5 +35,5 @@
 public option z3_non_commercial : string = "unknown"
   -- "status of Z3 activation for non-commercial use (yes, no, unknown)"
 
-public option MaSh : string = "sml"
+public option MaSh : string = "none"
   -- "machine learning algorithm to use by Sledgehammer (nb_knn, nb, knn, none)"