Merge branch 'master' of github.com:EliasAAradsson/introprog

quickref/quickref.tex

@@ -565,9 +565,6 @@
 \end{tabular}
 }% small
 
-{\small Other collection-like methods on \textbf{Option}: foreach, isEmpty, filter, toVector, ..., on \textbf{Try}: map, foreach, toOption, ... }
-
-
 \vspace{0.25em}
 {\small\renewcommand{\arraystretch}{1.0}
 {\textbf{Try[T]} is like a collection with \textbf{Success[T]} or \textbf{Failure[E]}.\hfill\code|import scala.util.{Try, Success, Failure}|}
@@ -580,6 +577,10 @@
 \code|Try(1/0) match { case Success(x) => x; case Failure(e) => 0 }| %\Comment{~~e is ArithmeticException}
 }
 
+{\small Predicates on \textbf{Option}: isEmpty, isDefined. Predicates on \textbf{Try}: isSuccess, isFailure} \\
+{\small Other collection-like methods on \textbf{Option}: foreach, flatMap, filter, toVector, ..., on \textbf{Try}: map, foreach, toOption, ... }
+
+
 
 
 \vspace{0.5em}\head{Reading/writing from file, and standard in/out:}\Newline