Skip to content

Commit

Permalink
Merge pull request Pyomo#3365 from emma58/typo-fix
Browse files Browse the repository at this point in the history
Fixing a couple typos the new version of typos (1.24.5) is finding
  • Loading branch information
mrmundt authored Sep 10, 2024
2 parents cda2d02 + 68ba5d6 commit df51e99
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ jobs:
$BARON_DIR = "${env:TPL_DIR}/baron"
echo "$BARON_DIR" | `
Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
$URL = "https://minlp.com/downloads/xecs/baron/current/"
$URL = "https://minlp-downloads.nyc3.cdn.digitaloceanspaces.com/xecs/baron/current/"
if ( "${{matrix.TARGET}}" -eq "win" ) {
$INSTALLER = "${env:DOWNLOAD_DIR}/baron_install.exe"
$URL += "baron-win64.exe"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test_pr_and_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ jobs:
$BARON_DIR = "${env:TPL_DIR}/baron"
echo "$BARON_DIR" | `
Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
$URL = "https://minlp.com/downloads/xecs/baron/current/"
$URL = "https://minlp-downloads.nyc3.cdn.digitaloceanspaces.com/xecs/baron/current/"
if ( "${{matrix.TARGET}}" -eq "win" ) {
$INSTALLER = "${env:DOWNLOAD_DIR}/baron_install.exe"
$URL += "baron-win64.exe"
Expand Down Expand Up @@ -698,6 +698,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: ${{github.job}}_${{env.GHA_JOBGROUP}}-${{env.GHA_JOBNAME}}
include-hidden-files: true
path: |
.coverage
coverage.xml
Expand Down
2 changes: 1 addition & 1 deletion examples/doc/samples/case_studies/diet/DietProblem.tex
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ \subsection*{Build the model}

The comma indicates that this parameter is over two different sets, and thus is in two dimensions. When we create the data file, we will be able to fill in how much of each nutrient each food contains.

At this point we have defined our sets and parameters. However, we have yet to cosnider the amount of food to be bought and eaten. This is the variable weâre trying to solve for, and thus we create an object of the variable class. Since this is just recording how much food to purchase, we create a one dimensional variable over food:
At this point we have defined our sets and parameters. However, we have yet to consider the amount of food to be bought and eaten. This is the variable weâre trying to solve for, and thus we create an object of the variable class. Since this is just recording how much food to purchase, we create a one dimensional variable over food:

\begin{verbatim}model.amount=Var(model.foods, within = NonNegativeReals) \end{verbatim}

Expand Down
2 changes: 1 addition & 1 deletion examples/doc/samples/case_studies/diet/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ model.nutrient_value=Param(model.nutrients, model.foods)

The comma indicates that this parameter is over two different sets, and thus is in two dimensions. When we create the data file, we will be able to fill in how much of each nutrient each food contains.

At this point we have defined our sets and parameters. However, we have yet to cosnider the amount of food to be bought and eaten. This is the variable we're trying to solve for, and thus we create an object of the variable class. Since this is just recording how much food to purchase, we create a one dimensional variable over food:
At this point we have defined our sets and parameters. However, we have yet to consider the amount of food to be bought and eaten. This is the variable we're trying to solve for, and thus we create an object of the variable class. Since this is just recording how much food to purchase, we create a one dimensional variable over food:

{{{
#!python
Expand Down

0 comments on commit df51e99

Please sign in to comment.