Skip to content

Merge master into solver-rewrite#4

Merged
michaelbynum merged 275 commits intojsiirola:solver-rewritefrom
Pyomo:master
Feb 24, 2020
Merged

Merge master into solver-rewrite#4
michaelbynum merged 275 commits intojsiirola:solver-rewritefrom
Pyomo:master

Conversation

@michaelbynum
Copy link
Copy Markdown
Collaborator

@michaelbynum michaelbynum commented Feb 24, 2020

Fixes # .

Summary/Motivation:

Changes proposed in this PR:

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the BSD license.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

qtothec and others added 30 commits December 17, 2019 22:39
@qtothec
Merge pull request #1230 from mrmundt/ubuntu-github-actions
42b949e 
Ubuntu Tests - GitHub actions
@allevin
Trying a different shell because If statements are different for powe…
978c100 
…rshell than cmd shells
@qtothec
Adjust output formatting for pyomo.util.infeasible
23843d8
@qtothec
Merge remote-tracking branch 'upstream/master' into infeasible_format…
9d05c49 
…ting
@qtothec
make this a class instead
fdcddf4
@qtothec
use standard no argument in Param
aed48b6
@qtothec
deprecate connector
d1ae6dc
@qtothec
move blockutil
6df5fcb
@qtothec
indicate something is private properly
ff92cc9
@qtothec
fix indent issue
8abb183
@qtothec
fix super call. add logging
60c2caf
@qtothec
Merge pull request #1234 from qtothec/infeasible_formatting
7288a11 
Adjust output formatting for pyomo.util.infeasible
@blnicho
Merge pull request #1236 from qtothec/not_giving_arguments
95cdca3 
changing NoArgumentGiven to a class
@qtothec
move deprecation messages to avoid import-time warning
c9c8529
@qtothec
import from util instead of code in 2 places
6dfea83
@blnicho
Build dictionaries more efficiently using dict comprehension
4ddc868
@mrmundt
Powershell vs Command line files added from Aaron's fork
407c8af
@mrmundt
Adding matrixed Python options for Mac
46c90db
@mrmundt
Removed Ubuntu control test
4f53bbf
@mrmundt
Merge branch 'master' of git://github.com/Pyomo/pyomo into mac-github…
4297efa 
…-actions
@mrmundt
Failure for Python 3.5 - testing change in installed dependencies
ad12ac3
@mrmundt
Homebrew is installed on Mac Runners so attempting to use this to fix…
161abba 
… the pyodbc failure
@mrmundt
Trying new fix for Python 3.5 pyodbc issue
fe9f69e
@mrmundt
Testing pip install ipopt and glpk - start to adding solvers
14f5945
@mrmundt
Cython was not found - adding explicit cython install
607f37e
@mrmundt
Cython was not found - pip installing cython first
5c0a499
@mrmundt
Had to reset history back to last time tests worked - installing modu…
d05b399 
…les before solvers
@mrmundt
Removing ipopt - path issues that can be diagnosed later. Want to see…
8922498 
… if glpk works.
@mrmundt
Removing ipopt - path issues that can be diagnosed later. Want to see…
dc7c6f8 
… if glpk works.
@mrmundt
Attempting to install solvers via brew
1330237
mrmundt and others added 23 commits February 12, 2020 10:40
@mrmundt
Changed Ubuntu and Mac Python-check routine
bba5e51
@michaelbynum
working on appveyor build
cc29902
@michaelbynum
working on appveyor build
a68cf88
@mrmundt
Removed erroneous print messages for API bindings
e2e81d6
@michaelbynum
working on appveyor build
62125d6
@michaelbynum
working on appveyor build
8663876
@michaelbynum
working on appveyor build
5ea5d31
@michaelbynum
working on appveyor build
e85cb37
@mrmundt
Typo correction
e557faf
@michaelbynum
working on appveyor build
235cc29
@michaelbynum
working on appveyor build
a403c56
@jsiirola
Merge pull request #1281 from mrmundt/mac_gams
f8a3a1e 
Add GAMS to MacOS/Ubuntu GitHub Workflow test environments
@jsiirola
Merge pull request #1293 from michaelbynum/appveyor_build_fix
6dbc31b 
Appveyor: fix pip environment setup for python3.5
@jsiirola
Merge branch 'master' into cplex_direct_fix
b5cb9c9
@jsiirola
Synchronizing OSX/Ubuntu workflow drivers
8da1b33
@mrmundt
Adjusting printouts to match the standard used throughout Windows wor…
690f8d1 
…kflow
@jsiirola
Merge pull request #1276 from michaelbynum/cplex_direct_fix
d9229cf 
Cplex direct log file management fix
@jsiirola
Fixing component decorator return value.
f597faa 
This corrects the "@model.Constraint()" notation so that the decorated
function still appears in the calling namespace.
@jsiirola
Fix timing construction of objects without index_set()
d519595
@jsiirola
Merge pull request #1296 from jsiirola/decorator-fix
4e0f78d 
Fix component decorator return value
@jsiirola
Merge pull request #1298 from jsiirola/timing-fix
bf7daa3 
Fix report_timing for constructing objects without index_set()
@blnicho
Remove CBC from our installation documentation
326456b
@blnicho
Merge pull request #1303 from blnicho/doc-remove-cbc
8558a54 
NFC: Remove CBC from our installation documentation
@michaelbynum michaelbynum merged commit 706f0cc into jsiirola:solver-rewrite Feb 24, 2020
jsiirola pushed a commit that referenced this pull request May 22, 2020
@michaelbynum
Merge pull request #4 from Robbybp/pynumero_interior_point
36e8ffa 
solver class, memory reallocation, and regularization
jsiirola pushed a commit that referenced this pull request Sep 30, 2021
Merge pull request #4 from Pyomo/master
811e312 
Update Pyomo fork with units fixes
jsiirola pushed a commit that referenced this pull request Jan 30, 2023
@jialuw96
Merge pull request #4 from Pyomo/main
4685d98 
Update doe-review with pyomo/main
jsiirola pushed a commit that referenced this pull request May 8, 2024
@smartin71
Merge pull request #4 from kaklise/parmest-redesign
e50ab9a 
Parmest redesign
jsiirola pushed a commit that referenced this pull request May 29, 2024
@adowling2
Merge pull request #4 from djlaky/pyomo-doe-fixes
7730aad 
Pyomo doe fixes
jsiirola pushed a commit that referenced this pull request Aug 10, 2024
@pmlpm1986
Merge pull request #4 from pmlpm1986/valsetindexprior
a239857 
Valsetindexprior
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.