texlive[48228] Master/texmf-dist: optidef (19jul18)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 19 23:11:40 CEST 2018
Revision: 48228
http://tug.org/svn/texlive?view=revision&revision=48228
Author: karl
Date: 2018-07-19 23:11:40 +0200 (Thu, 19 Jul 2018)
Log Message:
-----------
optidef (19jul18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/optidef/README.md
trunk/Master/texmf-dist/doc/latex/optidef/optidef.pdf
trunk/Master/texmf-dist/doc/latex/optidef/optidef.tex
trunk/Master/texmf-dist/tex/latex/optidef/optidef.sty
Modified: trunk/Master/texmf-dist/doc/latex/optidef/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/optidef/README.md 2018-07-19 21:11:25 UTC (rev 48227)
+++ trunk/Master/texmf-dist/doc/latex/optidef/README.md 2018-07-19 21:11:40 UTC (rev 48228)
@@ -11,6 +11,8 @@
- Implemenation of a short format where "minimize" is substituted by "min" and "subject to" by "s.t."
+- Possibility of splitting the optimization problem across multiple pages.
+
- It references optimization problem using three different policies:
* No equation is referenced
* The problem is referenced with a single label
@@ -35,7 +37,7 @@
The syntax to define an optimization problem is given by:
- >\begin{mini#}|sizeFormat|[constraintFormat]
+ >\begin{mini#}|sizeFormat|[constraintFormat]<break>
{optimizationVariable}
{objectiveFunction \label{objectiveReference}}
{\label{problemReference}}
@@ -66,13 +68,13 @@
Github: https://github.com/jeslago/optidef
-## Latest stable version: Optidef 2.7
+## Latest stable version: Optidef 3.0
CTAN: https://www.ctan.org/pkg/optidef
## Licensing
-Copyright 2017 Jesus Lago
+Copyright 2018 Jesus Lago
This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version.
The latest version of this license is in http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
Modified: trunk/Master/texmf-dist/doc/latex/optidef/optidef.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/optidef/optidef.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/optidef/optidef.tex 2018-07-19 21:11:25 UTC (rev 48227)
+++ trunk/Master/texmf-dist/doc/latex/optidef/optidef.tex 2018-07-19 21:11:40 UTC (rev 48228)
@@ -7,7 +7,7 @@
\lstset{basicstyle=\ttfamily,breaklines=true}
% Title Page
-\title{\textit{\textbf{Optidef}} \\ A Latex library for optimization problems\\ \textnormal{Version - 2.7}}
+\title{\textit{\textbf{Optidef}} \\ A Latex library for optimization problems\\ \textnormal{Version - 3.0}}
\author{Jesus Lago}
@@ -35,6 +35,7 @@
\item It allows four different outputs for the location of the constraints. For more details refer to Sections \ref{sec:syntax} and \ref{sec:format}.
\item It allows the definition of a limitless number of constraints. For more details refer to Section \ref{subsec:syntax}.
\item Four different type of problems: \textit{minimize}, \textit{maximize}, \textit{arg min} and \textit{arg max}. For more details refer to Sections \ref{sec:syntax} and \ref{sec:environments}.
+\item The optimization problem can be broken in several pages without compromising the alignment or the structure of the problem. For more details refer to Section \ref{sec:breakpages}.
\item The objective function can be broken in several lines without compromising the alignment or the structure of the problem. For more details refer to Section \ref{sec:breakObj}.
\end{enumerate}
@@ -60,7 +61,7 @@
Considering that \verb|Const.i| stands for constraint $i$, \verb|LHS.i| stands for the left-hand-side of constraint $i$, and \verb|RHS.i| for the right-hand-side counterpart, the basic structure to define a general optimization problem with $N$ constraints is:
\begin{verbatim}
-\begin{mini#}|sizeFormat|[constraintFormat]
+\begin{mini#}|sizeFormat|[constraintFormat]<break>
{optimizationVariable}
{objectiveFunction\label{objective}}
{\label{optimizationProblem}}
@@ -90,6 +91,7 @@
\item 2: for Alternative 2 in Section \ref{sec:format}
\item 3: for Alternative 3 in Section \ref{sec:format}
\end{itemize}
+ \item (Optional) \verb|break|: optional parameter to allow the optimization problem to break across multiple pages. For details on this feature, check Section \ref{sec:breakpages}.
\item \verb|optimizationVariable|: variable to be optimizated in the problem, e.g. $w \in \Re^N$.
\item \verb|objectiveFunction\label{objective}|: function to be minimized/maximized as a function of the optimization variable, e.g. $\|w\|_2$. If required, the objective function label should also be included withing this term
\item \verb|\label{optimizationProblem}|: it defines the main and general reference for the optimization problem. It is used for the \verb|mini| and \verb|mini!| enviroments. In the \verb|mini*| environment should be left blank, i.e. \{\}, \textbf{not to be ommited}.
@@ -297,7 +299,59 @@
\subsection{Default format}
The default format is alternative 0. To change the default format across the whole document, the package can be imported using one of the three options: \verb|c1|, \verb|c2|, \verb|c3|, i.e.:
+\section{Breaking the optimization problem across multiple pages}
+\label{sec:breakpages}
+In several cases, people encounter the problem of having an optimization problem that is too long to fit in a single page. In those cases, optidef can automatically break the problem across multiple pages by simply using the optional argument \verb|<b>|. For example:
+\begin{lstlisting}
+\begin{mini*}<b>
+{w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
+\breakObjective{-g(w^3-x^2*200+10000*w^5)}
+\addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1}
+\addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
+\end{mini*}
+\end{lstlisting}
+
+For the \verb|mini|, \verb|maxi|, \verb|argmini|, and \verb|argmaxi| environments, when the option \verb|<b>| is provided, the environment does not automatically set the numbering nor the label of the environment. To create the number/label, the command \verb|\labelOP{label}| should be used. In particular, in the equation/constraint of the optimization problem where the label/number should be located, simply add \verb|\labelOP{label}|. For example, the following code:
+
+\begin{lstlisting}
+\begin{mini}<b>
+{w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
+\breakObjective{-g(w^3-x^2*200+10000*w^5)}
+\addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1 \labelOP{eq:label}}
+\addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
+\end{mini}
+\end{lstlisting}
+
+\noindent would display this:
+
+\begin{mini}<b>
+ {w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
+ \breakObjective{-g(w^3-x^2*200+10000*w^5)}
+ \addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1 \labelOP{eq:label}}
+ \addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
+\end{mini}
+
+In addition to automatic breaking equations, manual breaks at selected locations can also be done using the \verb|\displaybreak| command. Just add \verb|\displaybreak| between the two constraints that need to be broken, e.g.:
+
+\begin{lstlisting}
+\begin{mini}<b>
+{w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
+\breakObjective{-g(w^3-x^2*200+10000*w^5)}
+\addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1 \labelOP{eq:label}}
+\displaybreak
+\addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
+\end{mini}
+\end{lstlisting}
+\noindent would display:
+\begin{mini}<b>
+ {w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
+ \breakObjective{-g(w^3-x^2*200+10000*w^5)}
+ \addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1 \labelOP{eq:label}}
+ \displaybreak
+ \addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
+\end{mini}
+
\section{Breaking the objective across several lines}
\label{sec:breakObj}
In several cases, people encounter the problem of having an optimization problem which objective function is too long to be set in a single line. In such cases, a line breaking that respects the rest of the problem syntax would be desirable. To account for that, the command \verb|\breakObjective| can be used. The idea is that, if the objective function shall be split in $n$ different functions, e.g.~$f_1,\ldots,f_n$, the default objective parameter would include just $f_1$ and then, we would include $n-1$ statements \verb|\breakObjective|($f_k$), $\forall k=2,\ldots,n$ right before defining the \verb|\addConstraint| commands.
@@ -370,7 +424,7 @@
\end{mini!}
\section{Compatibility issues with other packages}
-Issues with two different packages have been reported: cleveref and babel.
+Issues with three different packages have been reported: cleveref, babel, and mathabx.
\subsection{Cleveref}
When using the cleveref package in couple with the optidef package two measures have to taken for the packages to work properly:
@@ -415,7 +469,16 @@
This issue has been resolved starting from Optidef 2.7, where a working alternative to the \verb|mini!| environment is included: the \verb|minie| enviroment. Both environemnts have the same functionality, but when using the babel package it is recommended to use the \verb|minie| environment to avoid issues.
+\subsection{Mathabx}
+When using the mathabx package in couple with the optidef package, the optidef package must be loaded first in order to avoid malfunction of the mathabx package. In addition, the amsmath package should also be loaded before both of them. The preamble should look like:
+\begin{verbatim}
+\usepackage{amsmath}
+\usepackage{mathabx}
+\usepackage{optidef}
+\end{verbatim}
+
+
\section{Examples}
\subsection{Example 1 - mini environment}
The code:
@@ -635,6 +698,8 @@
\addConstraint{h(x)}{=0.}
\end{mini}
+
+
\subsection{Example 9 - Breaking a long objective}
\begin{lstlisting}
\begin{mini*}
@@ -653,7 +718,7 @@
\end{mini}
-\subsection{Example 9 - Extra Alignment in the Constraints}
+\subsection{Example 10 - Extra Alignment in the Constraints}
\label{ex:extra}
Adding optional alignment to add constraint names:
@@ -668,7 +733,7 @@
\end{mini*}
\end{verbatim}
-\subsection{Example 10 - The \textit{argmini} Environment}
+\subsection{Example 11 - The \textit{argmini} Environment}
Similar to the \verb|mini|, \verb|mini*| and \verb|mini!| environments, the environments \verb|argmini|, \verb|argmini*| and \verb|argmini!| are very similar environments that use the same syntax but the output is slightly different:
\begin{verbatim}
@@ -695,7 +760,7 @@
\addConstraint{h(x)}{=0.}
\end{argmini}
-\subsection{Example 11 - The \textit{maxi} and \textit{argmaxi} Environments}
+\subsection{Example 12 - The \textit{maxi} and \textit{argmaxi} Environments}
Exactly the same syntax and definition as the previous environments, but now for defining maximization environments. The following code serves for illustration:
\begin{verbatim}
@@ -723,11 +788,40 @@
\addConstraint{h(x)}{=0.}
\end{maxi}
+\subsection{Example 13 - Breaking optimization problem}
+\begin{lstlisting}
+\begin{mini}<b>
+{w}{f(w)+ R(w+6x)}
+{\label{eq:Example1}}{}
+\addConstraint{g(w)}{=0}
+\addConstraint{n(w)}{= 6}
+\addConstraint{L(w)+r(x)}{=Kw+p}
+\addConstraint{h(x)}{=0.}
+\end{mini}
-\subsection{Example 12 - All Possible Parameters}
+\end{lstlisting}
+outputs:
+\begin{mini}<b>
+ {w}{f(w)+ R(w+6x)}
+{\label{eq:Example1}}{}
+\addConstraint{g(w)}{=0}
+%\addConstraint{p(w)}{=0}
+%\addConstraint{q(w)}{=0}
+%\addConstraint{r(w)}{=0}
+%\addConstraint{s(w)}{=0}
+%\addConstraint{t(w)}{=0}
+%\addConstraint{v(w)}{=0}
+%\addConstraint{z(w)}{=0}
+\addConstraint{n(w)}{= 6}
+\addConstraint{L(w)+r(x)}{=Kw+p}
+\addConstraint{h(x)}{=0.}
+\end{mini}
+
+\subsection{Example 14 - All Possible Parameters}
+
\begin{verbatim}
-\begin{mini!}|s|[1]
+\begin{mini!}|s|[1]<b>
{w}{f(w)+ R(w+6x)}
{}{w^*=}
\addConstraint{g(w)}{=0,}{ \quad \text{(Dynamic constraint)}}
@@ -737,7 +831,7 @@
\end{mini!}
\end{verbatim}
-\begin{mini!}|s|[2]
+\begin{mini!}|s|[2]<b>
{w}{f(w)+ R(w+6x)\label{eq:ObjectiveExample3}}
{\label{eq:Example3}}
{w^*=}
Modified: trunk/Master/texmf-dist/tex/latex/optidef/optidef.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/optidef/optidef.sty 2018-07-19 21:11:25 UTC (rev 48227)
+++ trunk/Master/texmf-dist/tex/latex/optidef/optidef.sty 2018-07-19 21:11:40 UTC (rev 48228)
@@ -1,6 +1,6 @@
-% optidef - Version 2.7
+% optidef - Version 3.0
%
-%Copyright 2017 Jesus Lago
+%Copyright 2018 Jesus Lago
%
%This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version.
%The latest version of this license is in http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
@@ -12,7 +12,7 @@
%This work consists of the file optidef.sty.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{optidef}[2018/05/23 - version=2.7, Package for defining optimization problems]
+\ProvidesPackage{optidef}[2018/07/19 - version=3.0, Package for defining optimization problems]
\RequirePackage{environ}
\RequirePackage{mathtools}
@@ -26,9 +26,11 @@
% DEFINING PACKAGE OPTIONS
%%%%%%%%%%%%%%%%%%%%%%%
% Default
+
\newcommand{\defaultOCPConstraint}{,}
\newcommand{\defaultProblemFormat}{l}
\newcommand{\defaultConstraintFormat}{0}
+\newcommand{\labelOP}[1]{\stepcounter{equation}\tag{\theequation}\label{#1}}
\DeclareOption{short}{
\renewcommand{\defaultProblemFormat}{s}
@@ -519,6 +521,7 @@
% Base environment for the three possible types of referencing: 1 label, no label or multilabel
% Base environment defined using NewEnviron package because of \BODY command
\NewEnviron{BaseMini}[6]{%
+
\selectConstraint{#1}
\renewcommand{\localOptimalVariable}{#2}
\begin{equation}
@@ -527,24 +530,35 @@
\bodyobj{#2}{#3}{#6}{#5}
\BODY
\end{alignedat}
-\end{equation}
+\end{equation}
\setStandardMini
}
-\NewEnviron{BaseMiniStar}[5]{%
+\NewEnviron{BaseMiniStar}[6]{%
\selectConstraint{#1}
\renewcommand{\localOptimalVariable}{#2}
+\ifthenelse{\equal{#6}{b}}{
+ \begingroup
+ \allowdisplaybreaks
+}{}
\begin{alignat*}{5}
\bodyobj{#2}{#3}{#5}{#4}
\BODY
\end{alignat*}
+\ifthenelse{\equal{#6}{b}}{
+ \endgroup
+}{}
\setStandardMini
}
-\NewEnviron{BaseMiniExclam}[6]{%
+\NewEnviron{BaseMiniExclam}[7]{%
\selectConstraintMult{#1}
\renewcommand{\localOptimalVariable}{#2}
+\ifthenelse{\equal{#7}{b}}{
+ \begingroup
+ \allowdisplaybreaks
+}{}
\begin{subequations}
#4
\begin{alignat}{5}
@@ -552,6 +566,9 @@
\BODY
\end{alignat}
\end{subequations}
+\ifthenelse{\equal{#7}{b}}{
+ \endgroup
+}{}
\setStandardMini
}
@@ -563,146 +580,191 @@
% In the below definitions, \toggletrue{bodyCon} has to be added once the definition of the environment is finished. I tried to do inside the environment itself using \setStandardMini, but it produced some ugly text displacemente.
% Single reference probems
-\DeclareDocumentEnvironment{mini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
-{\ifthenelse{\equal{#1}{s}}
-% Short version problem
-{\setFormatShort{min}{#2} \BaseMini{#2}{#3}{#4}{#5}{#6}{min}}
-% Long version problem
-{\setFormatLong{minimize}{#2} \BaseMini{#2}{#3}{#4}{#5}{#6}{minimize}}
-}{\endBaseMini\toggletrue{bodyCon}}
+\DeclareDocumentEnvironment{mini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
+\ifthenelse{\equal{#3}{b}}
+{
+ \ifthenelse{\equal{#1}{s}}
+ % Short version problem
+ {\setFormatShort{min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}
+ % Long version problem
+ {\setFormatLong{minimize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}
+}
+{
+ \ifthenelse{\equal{#1}{s}}
+ % Short version problem
+ {\setFormatShort{min}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{min}}
+ % Long version problem
+ {\setFormatLong{minimize}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{minimize}}
+}
+}%
+{\endBaseMini\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
-{\ifthenelse{\equal{#1}{s}}
-% Short version problem
-{\setFormatShort{arg~min}{#2} \BaseMini{#2}{#3}{#4}{#5}{#6}{arg~min}}
-% Long version problem
-{\setFormatLong{arg~min}{#2} \BaseMini{#2}{#3}{#4}{#5}{#6}{arg~min}}
-}{\endBaseMini\toggletrue{bodyCon}}
+\DeclareDocumentEnvironment{argmini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
+ \ifthenelse{\equal{#3}{b}}
+ {
+ \ifthenelse{\equal{#1}{s}}
+ % Short version problem
+ {\setFormatShort{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
+ % Long version problem
+ {\setFormatLong{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
+ }
+ {
+ \ifthenelse{\equal{#1}{s}}
+ % Short version problem
+ {\setFormatShort{arg~min}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}
+ % Long version problem
+ {\setFormatLong{arg~min}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}
+ }
+}%
+{\endBaseMini\toggletrue{bodyCon}}
+
% No reference
-\DeclareDocumentEnvironment{mini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{mini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniStar{#2}{#3}{#4}{#6}{min}}
+ {\setFormatShort{min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniStar{#2}{#3}{#4}{#6}{minimize}}
+ {\setFormatLong{minimize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}
}{\endBaseMiniStar\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{argmini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
% Short version problem
-{\setFormatShort{arg~min}{#2}\BaseMiniStar{#2}{#3}{#4}{#6}{arg~min}}
+{\setFormatShort{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
% Long version problem
-{\setFormatLong{arg~min}{#2} \BaseMiniStar{#2}{#3}{#4}{#6}{arg~min}}
+{\setFormatLong{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
}{\endBaseMiniStar\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{mini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{mini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{min}}
+ {\setFormatShort{min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{minimize}}
+ {\setFormatLong{minimize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{argmini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
- % Short version problem
- {\setFormatShort{arg~min}{#2}\BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~min}}
- % Long version problem
- {\setFormatLong{arg~min}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~min}}
+% Short version problem
+{\setFormatShort{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
+% Long version problem
+{\setFormatLong{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-
-\DeclareDocumentEnvironment{minie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+% Multiple reference
+\DeclareDocumentEnvironment{minie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{min}}
+ {\setFormatShort{min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{minimize}}
+ {\setFormatLong{minimize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argminie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+
+\DeclareDocumentEnvironment{argminie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
% Short version problem
- {\setFormatShort{arg~min}{#2}\BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~min}}
+ {\setFormatShort{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
% Long version problem
- {\setFormatLong{arg~min}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~min}}
+ {\setFormatLong{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-
%MAXIMIZATION ENVIRONMENTS
% Single reference probems
-\DeclareDocumentEnvironment{maxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
-{\ifthenelse{\equal{#1}{s}}
- % Short version problem
- {\setFormatShort{max}{#2} \BaseMini{#2}{#3}{#4}{#5}{#6}{max}}
- % Long version problem
- {\setFormatLong{maximize}{#2} \BaseMini{#2}{#3}{#4}{#5}{#6}{maximize}}
-}{\endBaseMini\toggletrue{bodyCon}}
+\DeclareDocumentEnvironment{maxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
+ \ifthenelse{\equal{#3}{b}}
+ {
+ \ifthenelse{\equal{#1}{s}}
+ % Short version problem
+ {\setFormatShort{max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}
+ % Long version problem
+ {\setFormatLong{maximize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}
+ }
+ {
+ \ifthenelse{\equal{#1}{s}}
+ % Short version problem
+ {\setFormatShort{max}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{max}}
+ % Long version problem
+ {\setFormatLong{maximize}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{maximize}}
+ }
+}%
+{\endBaseMini\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
-{\ifthenelse{\equal{#1}{s}}
- % Short version problem
- {\setFormatShort{arg~max}{#2} \BaseMini{#2}{#3}{#4}{#5}{#6}{arg~max}}
- % Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMini{#2}{#3}{#4}{#5}{#6}{arg~max}}
-}{\endBaseMini\toggletrue{bodyCon}}
+\DeclareDocumentEnvironment{argmaxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
+ \ifthenelse{\equal{#3}{b}}
+ {
+ \ifthenelse{\equal{#1}{s}}
+ % Short version problem
+ {\setFormatShort{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
+ % Long version problem
+ {\setFormatLong{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
+ }
+ {
+ \ifthenelse{\equal{#1}{s}}
+ % Short version problem
+ {\setFormatShort{arg~max}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}
+ % Long version problem
+ {\setFormatLong{arg~max}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}
+ }
+}%
+{\endBaseMini\toggletrue{bodyCon}}
% No reference
-\DeclareDocumentEnvironment{maxi*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{maxi*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
- % Short version problem
- {\setFormatShort{max}{#2} \BaseMiniStar{#2}{#3}{#4}{#6}{max}}
- % Long version problem
- {\setFormatLong{maximize}{#2} \BaseMiniStar{#2}{#3}{#4}{#6}{maximize}}
+% Short version problem
+{\setFormatShort{max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}
+% Long version problem
+{\setFormatLong{maximize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}
}{\endBaseMiniStar\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxi*}{D||{l} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{argmaxi*}{D||{l} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
- % Short version problem
- {\setFormatShort{arg~max}{#2}\BaseMiniStar{#2}{#3}{#4}{#6}{arg~max}}
- % Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMiniStar{#2}{#3}{#4}{#6}{arg~max}}
+% Short version problem
+{\setFormatShort{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
+% Long version problem
+{\setFormatLong{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
}{\endBaseMiniStar\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{maxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{maxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
- % Short version problem
- {\setFormatShort{max}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{max}}
- % Long version problem
- {\setFormatLong{maximize}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{maximize}}
+% Short version problem
+{\setFormatShort{max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}
+% Long version problem
+{\setFormatLong{maximize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{argmaxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
- % Short version problem
- {\setFormatShort{arg~max}{#2}\BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~max}}
- % Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~max}}
+% Short version problem
+{\setFormatShort{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
+% Long version problem
+{\setFormatLong{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
}{\endBaseMiniExclam\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{maxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{maxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
% Short version problem
- {\setFormatShort{max}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{max}}
+ {\setFormatShort{max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}
% Long version problem
- {\setFormatLong{maximize}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{maximize}}
+ {\setFormatLong{maximize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} m m m m}
+\DeclareDocumentEnvironment{argmaxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
{\ifthenelse{\equal{#1}{s}}
% Short version problem
- {\setFormatShort{arg~max}{#2}\BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~max}}
+ {\setFormatShort{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
% Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~max}}
+ {\setFormatLong{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
}{\endBaseMiniExclam\toggletrue{bodyCon}}
\ No newline at end of file
More information about the tex-live-commits
mailing list