Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions docs/src/submodules/FileFormats/LP.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ In addition to the grammar, there are the following rules:
* Newlines are ignored, except where explicitly described

```
<lp-file> :==
<lp-file> :==
<keyword-objective>\n
[<section-objective>\n]
<keyword-constraints>\n
Expand All @@ -52,7 +52,7 @@ In addition to the grammar, there are the following rules:
i"min" | i"minimum" | i"minimize" | i"minimise"
| i"max" | i"maximum" | i"maximize" | i"maximise"

<keyword-constraints> :==
<keyword-constraints> :==
(i"subject to" | i"st" | i"st." | i"s.t." | i"such that")[":"]

<keyword-bounds> :== i"bound" | i"bounds"
Expand All @@ -71,7 +71,7 @@ In addition to the grammar, there are the following rules:

<identifier> :== <char> (<char> | <digit> | ".")*

<number> :==
<number> :==
"+" <number>
| "-" <number>
| <digit>+[.(<digit>)*][("e" | "E")("+" | "-")(<digit>)+]
Expand Down Expand Up @@ -106,11 +106,11 @@ In addition to the grammar, there are the following rules:

<set-suffix> := <inequality> <number>

<set-prefix> := <number> <inequality>
<set-prefix> := <number> <inequality>

<constraint-indicator> :== <identifier> "=" (0 | 1) "->" <expression> <set-suffix>

<constraint-sos> :==
<constraint-sos> :==
"S1::" (<identifier>":"<number>)+\n
| "S2::" (<identifier>":"<number>)+\n

Expand Down Expand Up @@ -138,7 +138,7 @@ integers
x
```
Gurobi will interpret this as `x in MOI.Integer()`. FICO Xpress will interpret
this as `x in MOI.ZeroOne()`.
this as `x in MOI.ZeroOne()`.

FICO document this behavior, but they're an outlier.

Expand Down Expand Up @@ -168,7 +168,7 @@ x >= 0
end
```

**We choose to allow variables to be named as keywords, and we use context to
**We choose to allow variables to be named as keywords, and we use context to
disambiguate.**

### Whitespace
Expand All @@ -186,7 +186,7 @@ Xpress will interpret this as the expression `2 * x`.
Gurobi document this behavior, saying that they require whitespace around all
tokens, but they're an outlier.

**We choose to allow juxtaposted tokens without whitespace.**
**We choose to allow juxtaposed tokens without whitespace.**

### Identifiers

Expand Down
2 changes: 1 addition & 1 deletion docs/src/tutorials/latency.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ with the reasons for latency in Julia and how to fix them.

* Read the blogposts on julialang.org on [precompilation](https://julialang.org/blog/2021/01/precompile_tutorial/)
and [SnoopCompile](https://julialang.org/blog/2021/01/snoopi_deep/)
* Read the [SnoopCompile](https://timholy.github.io/SnoopCompile.jl/stable/)
* Read the [SnoopCompile](https://juliadebug.github.io/SnoopCompile.jl/stable/)
documentation.
* Watch Tim Holy's [talk at JuliaCon 2021](https://www.youtube.com/watch?v=rVBgrWYKLHY)
* Watch the [package development workshop at JuliaCon 2021](https://www.youtube.com/watch?v=wXRMwJdEjX4)
Expand Down
3 changes: 1 addition & 2 deletions docs/styles/config/vocabularies/JuMP/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ errored
flamegraph
getters
[Jj]ulia
juxtaposted
linkcheck
nonlinearly
nonzeros
Expand Down Expand Up @@ -59,4 +58,4 @@ QSopt
preprint
Lubin
Nemirovski
Xpress
Xpress
Loading