diff --git a/books/bookvol10.2.pamphlet b/books/bookvol10.2.pamphlet index cf91b3c..c01ab93 100644 --- a/books/bookvol10.2.pamphlet +++ b/books/bookvol10.2.pamphlet @@ -8984,32 +8984,45 @@ These exports come from \refto{SetCategory}(): ++ The class of totally ordered sets, that is, sets such that for each ++ pair of elements \spad{(a,b)} ++ exactly one of the following relations holds \spad{a a a Boolean ++ x < y is a strict total ordering on the elements of the set. + ">": (%, %) -> Boolean ++ x > y is a greater than test. + ">=": (%, %) -> Boolean ++ x >= y is a greater than or equal test. + "<=": (%, %) -> Boolean ++ x <= y is a less than or equal test. + max: (%,%) -> % ++ max(x,y) returns the maximum of x and y relative to "<". + min: (%,%) -> % ++ min(x,y) returns the minimum of x and y relative to "<". + add x,y: % + -- These really ought to become some sort of macro + max(x,y) == x > y => x y + min(x,y) == x > y => y x + ((x: %) > (y: %)) : Boolean == y < x + ((x: %) >= (y: %)) : Boolean == not (x < y) + ((x: %) <= (y: %)) : Boolean == not (y < x) \end{chunk} diff --git a/buglist b/buglist index 0544b87..b2ecb84 100644 --- a/buglist +++ b/buglist @@ -965,18 +965,6 @@ typos 40348: ========================================================================= -typos 40346: - ->compiling ORDSET.spad to ORDSET.nrlib - ---->-->OrderedSet&(constructor): Missing left brace -"The class of totally ordered sets, that is, sets such that for each pair of elements \\spad{(a,b)} exactly one of the following relations holds \\spad{a} abookvol10.2.pamphlet-->OrderedSet(constructor): Missing left brace -"The class of totally ordered sets, that is, sets such that for each pair of elements \\spad{(a,b)} exactly one of the following relations holds \\spad{a} acompiling REAL.spad to REAL.nrlib @@ -40523,4 +40511,16 @@ typos 40347: --->bookvol10.3.pamphlet-->NumericalOptimizationProblem(constructor): Missing left brace "\\axiomType{NumericalOptimizationProblem} is a \\axiom{domain} for the representation of Numerical Optimization problems for use by ANNA. \\blankline The representation is a Union of two record types - one for otimization of a single function of one or more variables: \\blankline \\axiomType{Record}(\\br fn:\\axiomType{Expression DoubleFloat},\\br init:\\axiomType{List DoubleFloat},\\br lb:\\axiomType{List OrderedCompletion DoubleFloat},\\br cf:\\axiomType{List Expression DoubleFloat},\\br ub:\\axiomType{List OrderedCompletion DoubleFloat}) \\blankline and one for least-squares problems \\spadignore{i.e.} optimization of a set of observations of a data set: \\blankline \\axiomType{Record}(lfn:\\axiomType{List Expression DoubleFloat},\\br init:\\axiomType{List DoubleFloat})." +fixed 20130317.05.tpd.patch +========================================================================= +typos 40346: + +>compiling ORDSET.spad to ORDSET.nrlib + +--->-->OrderedSet&(constructor): Missing left brace +"The class of totally ordered sets, that is, sets such that for each pair of elements \\spad{(a,b)} exactly one of the following relations holds \\spad{a} abookvol10.2.pamphlet-->OrderedSet(constructor): Missing left brace +"The class of totally ordered sets, that is, sets such that for each pair of elements \\spad{(a,b)} exactly one of the following relations holds \\spad{a} a20130317.04.tpd.patch books/bookvol10.3 OPTPROB fix 40347 +20130317.05.tpd.patch +books/bookvol10.2 ORDSET fix 40346