Multiplying sets should not alter the arguments #1103
Merged
+4
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jsiirola
changed the title
michaelbynum
approved these changes
Aug 15, 2019
|
@jsiirola Thanks. |
These tests always silently demonstrated the Pyomo#134 error.
Codecov Report
@@ Coverage Diff @@
## master #1103 +/- ##
=======================================
Coverage 69.61% 69.61%
=======================================
Files 530 530
Lines 78467 78467
=======================================
Hits 54628 54628
Misses 23839 23839
Continue to review full report at Codecov.
|
ZhifeiYL
pushed a commit
to ZhifeiYL/pyomo
that referenced
this pull request
Aug 27, 2019
commit eb0a1e0 Author: Qi Chen <[email protected]> Date: Tue Aug 27 12:07:06 2019 -0400 Deleting accidentally committed files commit 12258ff Merge: 87baea0 215c424 Author: Qi Chen <[email protected]> Date: Tue Aug 27 11:54:25 2019 -0400 Merge remote-tracking branch 'upstream/master' into meeting_changes commit 87baea0 Author: Qi Chen <[email protected]> Date: Tue Aug 27 11:47:49 2019 -0400 to_string update and class method commit bdafd03 Author: reolistic <[email protected]> Date: Mon Aug 26 16:59:52 2019 -0400 pyomo/core/tests/unit/test_logical_expr_expanded4.py commit babdb19 Author: reolistic <[email protected]> Date: Mon Aug 26 16:01:57 2019 -0400 changes commit 215c424 Merge: 86e617c f1dd5a2 Author: Bethany Nicholson <[email protected]> Date: Mon Aug 19 20:42:56 2019 +0200 Merge pull request Pyomo#1102 from michaelbynum/fbbt_exp_fix avoiding math range errors in fbbt commit f1dd5a2 Author: Michael Bynum <[email protected]> Date: Mon Aug 19 08:21:16 2019 -0600 catching overflow errors in FBBT commit 86e617c Merge: 2f2a74d e13452d Author: John Siirola <[email protected]> Date: Thu Aug 15 12:20:41 2019 -0600 Merge pull request Pyomo#1103 from jsiirola/fix-mult-sets Multiplying sets should not alter the arguments commit e13452d Author: John Siirola <[email protected]> Date: Thu Aug 15 11:18:16 2019 -0600 Updating test baselines These tests always silently demonstrated the Pyomo#134 error. commit 4f9f44d Author: John Siirola <[email protected]> Date: Thu Aug 15 09:06:22 2019 -0600 Multiplying sets should not alter the arguments (fixes Pyomo#134) commit f76676c Author: Michael Bynum <[email protected]> Date: Thu Aug 15 07:56:30 2019 -0600 avoiding math range errors in fbbt commit 2f2a74d Merge: dab7a41 57ef5ba Author: Bethany Nicholson <[email protected]> Date: Wed Aug 14 17:01:00 2019 +0200 Merge pull request Pyomo#1085 from emma58/mpec-descend-into-disjuncts MPEC descend into disjuncts commit dab7a41 Merge: 51f165a 2b012c7 Author: John Siirola <[email protected]> Date: Tue Aug 13 16:24:33 2019 -0600 Merge pull request Pyomo#1099 from jsiirola/cython-fix Fixing typo that caused cython build failures commit 2b012c7 Author: John Siirola <[email protected]> Date: Tue Aug 13 15:06:06 2019 -0600 Changing definition of precision string to resolve cython issues commit fd1454a Author: John Siirola <[email protected]> Date: Tue Aug 13 14:19:28 2019 -0600 Changing definition of precision string to resolve cython issues commit 51f165a Merge: dda606c 10d8c57 Author: Bethany Nicholson <[email protected]> Date: Tue Aug 13 20:57:38 2019 +0200 Merge pull request Pyomo#1092 from eslickj/fix_edit Model viewer fix for editing numbers in tree views commit 55911c5 Author: John Siirola <[email protected]> Date: Mon Aug 12 15:59:20 2019 -0600 Fixing typo that caused cython build failures commit dda606c Merge: ff65c06 54c140e Author: John Siirola <[email protected]> Date: Mon Aug 12 15:43:39 2019 -0600 Merge pull request Pyomo#989 from jsiirola/remove-reciprocal Replace ReciprocalExpression with DivisionExpression commit 54c140e Merge: d8b53c1 56bdaee Author: John Siirola <[email protected]> Date: Mon Aug 12 15:17:27 2019 -0600 Merge remote-tracking branch 'refs/remotes/jsiirola/remove-reciprocal' into remove-reciprocal commit ff65c06 Merge: ceb9e35 5f4c4ab Author: John Siirola <[email protected]> Date: Mon Aug 12 11:33:58 2019 -0600 Merge pull request Pyomo#1094 from mathias-ke/patch-1 Update working_models.rst to refer to the correct example code commit 56bdaee Author: Michael Bynum <[email protected]> Date: Mon Aug 12 11:33:43 2019 -0600 Simplifying FBBT for division commit d8b53c1 Author: John Siirola <[email protected]> Date: Mon Aug 12 11:16:46 2019 -0600 Removing commented out code commit bf80f71 Author: John Siirola <[email protected]> Date: Mon Aug 12 11:13:41 2019 -0600 Removing commented code commit 561400c Merge: 5ff9fbb ceb9e35 Author: John Siirola <[email protected]> Date: Fri Aug 9 13:01:09 2019 -0600 Merge branch 'master' into remove-reciprocal commit ae49ef2 Author: reolistic <[email protected]> Date: Tue Aug 6 23:26:39 2019 +0800 update commit 5f4c4ab Author: mathias-ke <[email protected]> Date: Mon Aug 5 11:33:00 2019 +0200 Update working_models.rst Hi there, reading the doc I just noticed a duplicated entry (line 77 and line89). As I'm quite new to oemof and python I hope it is no problem that I tried to fix it this way. Have a nice week! BR Mathias commit 5d085eb Merge: ab4337d 1bef722 Author: reolistic <[email protected]> Date: Wed Jul 31 22:59:59 2019 -0400 Merge pull request #3 from qtothec/logical_fixes Changes we made on the call commit 1bef722 Author: Qi Chen <[email protected]> Date: Wed Jul 31 19:58:11 2019 -0700 changes that we made on telecon commit ab4337d Author: reolistic <[email protected]> Date: Wed Jul 31 22:20:37 2019 -0400 changes commit 10d8c57 Author: John Eslick <[email protected]> Date: Tue Jul 30 14:22:26 2019 -0400 Fix tests I hope. commit ead79f6 Author: John Eslick <[email protected]> Date: Tue Jul 30 13:16:38 2019 -0400 Fix editing numbers is the table views. commit 4d3b379 Author: reolistic <[email protected]> Date: Sun Jul 28 05:51:54 2019 -0400 new changes commit 98410ef Merge: 6450336 e5dcbbc Author: reolistic <[email protected]> Date: Wed Jul 24 22:07:15 2019 -0400 Merge branch 'master' of https://github.com/reolistic/pyomo commit 6450336 Author: reolistic <[email protected]> Date: Wed Jul 24 21:53:28 2019 -0400 setup commit ceb9e35 Merge: 6f7e00d e2cd372 Author: Bethany Nicholson <[email protected]> Date: Tue Jul 23 09:27:20 2019 -0600 Merge pull request Pyomo#1087 from andrewlee94/setting_indexed_bounds Adding methods to IndexedVar to set bounds commit e2cd372 Author: Andrew Lee <[email protected]> Date: Mon Jul 22 10:44:54 2019 -0400 Adding methods to IndexedVar to set bounds commit 6f7e00d Merge: 396af5a e486529 Author: Michael Bynum <[email protected]> Date: Fri Jul 19 18:56:53 2019 -0600 Merge pull request Pyomo#1086 from qtothec/diff_sqrt Add support for square root UnaryFunctionExpression in pyomo calculus commit e486529 Author: Qi Chen <[email protected]> Date: Thu Jul 18 14:06:14 2019 -0700 Hehe, oops. Test should test correct piece of code. commit 78e53a8 Author: Qi Chen <[email protected]> Date: Thu Jul 18 14:01:57 2019 -0700 Add test commit dbcce9c Author: Qi Chen <[email protected]> Date: Thu Jul 18 13:59:15 2019 -0700 Add support for square root UnaryFunctionExpression commit 396af5a Merge: 66874ab 5a9a5b5 Author: John Siirola <[email protected]> Date: Wed Jul 17 15:43:51 2019 -0600 Merge pull request Pyomo#983 from RomeoV/cleaning-up-OA-implementation Cleaning up mindtpy oa implementation commit e5dcbbc Author: reolistic <[email protected]> Date: Tue Jul 16 21:41:10 2019 -0400 Add files via upload commit 5a9a5b5 Author: Qi Chen <[email protected]> Date: Mon Jul 15 13:05:39 2019 -0700 Correct implementation of integer cuts for MindtPy. TODO: revisit idea of backtracking on a theoretical basis. Use assertAlmostEquals instead of assertTrue for more meaningful output commit 83465f9 Author: Qi Chen <[email protected]> Date: Mon Jul 15 10:46:23 2019 -0700 correct logical error commit 8e2c6fb Author: Qi Chen <[email protected]> Date: Mon Jul 15 10:45:50 2019 -0700 Romeo had rewritten int_to_binary to support negative integer domains. This commit codifies that as an official capability. commit 41f95f8 Author: Qi Chen <[email protected]> Date: Mon Jul 15 10:37:39 2019 -0700 revert unnecessary whitespace change commit c113833 Author: Qi Chen <[email protected]> Date: Mon Jul 15 08:42:22 2019 -0700 Restore previous functionality in int_to_binary By adding a new flag commit 57ef5ba Merge: 1bfc31c 66874ab Author: Emma Johnson <[email protected]> Date: Fri Jul 12 16:39:01 2019 -0400 Merge branch 'master' into mpec-descend-into-disjuncts commit 1bfc31c Author: Emma Johnson <[email protected]> Date: Fri Jul 12 16:35:33 2019 -0400 Removing debugging import... commit eae791b Author: Emma Johnson <[email protected]> Date: Fri Jul 12 16:30:09 2019 -0400 Testing that the result of each of the mpec transformations is the same regardless of whether they were called on the whole model or just the Block where the Complementarity lives commit d0b63c8 Author: Emma Johnson <[email protected]> Date: Fri Jul 12 16:29:18 2019 -0400 Looking for free variables on the entire model, not just on instance since it may have been a Block or a Disjunct commit 78d05dd Author: reolistic <[email protected]> Date: Fri Jul 12 15:08:46 2019 -0400 Add files via upload commit 0310bda Author: Emma Johnson <[email protected]> Date: Thu Jun 20 19:30:26 2019 -0400 Adding descent into Disjuncts to find Complementarity components in all the mpec transformations commit 3c8640d Author: Emma Johnson <[email protected]> Date: Thu Jun 20 18:19:35 2019 -0400 Adding tests to check if complementarity constraints get transformed as if we had called transformation on m.disjunct rather than m commit 0946184 Merge: 4b8d692 e225b78 Author: Romeo Valentin <[email protected]> Date: Fri May 10 14:56:30 2019 -0400 Merge branch 'cleaning-up-OA-implementation' of github.com:RomeoV/pyomo into cleaning-up-OA-implementation commit 4b8d692 Author: Romeo Valentin <[email protected]> Date: Fri May 10 14:56:06 2019 -0400 Fixed some of Qi's comments commit e225b78 Merge: 52a8462 1fcd664 Author: John Siirola <[email protected]> Date: Thu May 9 16:08:24 2019 -0600 Merge branch 'master' into cleaning-up-OA-implementation commit 52a8462 Merge: a917a5e 5b0a366 Author: RomeoV <[email protected]> Date: Wed May 8 14:38:49 2019 -0400 Merge branch 'master' into cleaning-up-OA-implementation commit a917a5e Author: Romeo Valentin <[email protected]> Date: Fri May 3 15:55:26 2019 -0400 Added docstring to old OA-cut method commit ead4260 Author: Romeo Valentin <[email protected]> Date: Fri May 3 15:49:29 2019 -0400 Fix rounding incompatability for python2 commit b2b9cf2 Author: Romeo Valentin <[email protected]> Date: Thu May 2 16:42:46 2019 -0400 Replace manual fixing by TransformationFactory commit ed3a73e Author: Romeo Valentin <[email protected]> Date: Thu May 2 15:46:15 2019 -0400 Added a lot more tests for OA commit 2758e46 Author: Romeo Valentin <[email protected]> Date: Thu May 2 15:45:12 2019 -0400 Integers can be any (integer) bound, i.e. [-4,4] instead of [0,8] commit 3960ada Author: Romeo Valentin <[email protected]> Date: Thu May 2 15:44:52 2019 -0400 Add support for integer variables (not just binaries) commit 5ff9fbb Author: John Siirola <[email protected]> Date: Wed May 1 22:33:18 2019 -0600 Tracking changes in master commit 07f345c Merge: d921d62 dcdc3de Author: John Siirola <[email protected]> Date: Wed May 1 19:43:53 2019 -0600 Merge branch 'master' into remove-reciprocal commit b79ecdc Author: Romeo Valentin <[email protected]> Date: Wed May 1 22:34:54 2019 -0400 Extended tests with more (already implemented) examples commit 182c760 Author: Romeo Valentin <[email protected]> Date: Wed May 1 17:33:44 2019 -0400 Updated create_oa_cut method commit 95761c0 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 22:51:18 2019 -0400 Renamed current OA, moved special PSC code to if Note that currently the tests will fail because no implementation for create_oa_cut is available. commit 434db65 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 19:41:37 2019 -0400 Split up the master solve method commit b0acf71 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 19:01:47 2019 -0400 Minor naming changes commit 0a22782 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 18:50:07 2019 -0400 Add some comments and todos commit 875ef00 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 18:37:30 2019 -0400 Support force-copying floats to binaries if specified commit 2a1c339 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 18:03:17 2019 -0400 Only pass solver result to hander if neccesary commit ab54185 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 18:02:10 2019 -0400 Add documentation to each NLP solver method commit 832cc44 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 17:18:29 2019 -0400 Fixed wrong indentations commit 9aecf19 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 16:57:42 2019 -0400 Broke down the solve_nlp method into solve and handle parts commit d921d62 Merge: 8f6e863 55bed8d Author: John Siirola <[email protected]> Date: Fri Apr 26 19:51:52 2019 -0600 Merge branch 'master' into remove-reciprocal commit 8f6e863 Author: John Siirola <[email protected]> Date: Fri Apr 26 19:03:38 2019 -0600 Replace ReciprocalExpression with DivisionExpression
ZhifeiYL
pushed a commit
to ZhifeiYL/pyomo
that referenced
this pull request
Aug 27, 2019
commit eb0a1e0 Author: Qi Chen <[email protected]> Date: Tue Aug 27 12:07:06 2019 -0400 Deleting accidentally committed files commit 12258ff Merge: 87baea0 215c424 Author: Qi Chen <[email protected]> Date: Tue Aug 27 11:54:25 2019 -0400 Merge remote-tracking branch 'upstream/master' into meeting_changes commit 87baea0 Author: Qi Chen <[email protected]> Date: Tue Aug 27 11:47:49 2019 -0400 to_string update and class method commit bdafd03 Author: reolistic <[email protected]> Date: Mon Aug 26 16:59:52 2019 -0400 pyomo/core/tests/unit/test_logical_expr_expanded4.py commit babdb19 Author: reolistic <[email protected]> Date: Mon Aug 26 16:01:57 2019 -0400 changes commit 215c424 Merge: 86e617c f1dd5a2 Author: Bethany Nicholson <[email protected]> Date: Mon Aug 19 20:42:56 2019 +0200 Merge pull request Pyomo#1102 from michaelbynum/fbbt_exp_fix avoiding math range errors in fbbt commit f1dd5a2 Author: Michael Bynum <[email protected]> Date: Mon Aug 19 08:21:16 2019 -0600 catching overflow errors in FBBT commit 86e617c Merge: 2f2a74d e13452d Author: John Siirola <[email protected]> Date: Thu Aug 15 12:20:41 2019 -0600 Merge pull request Pyomo#1103 from jsiirola/fix-mult-sets Multiplying sets should not alter the arguments commit e13452d Author: John Siirola <[email protected]> Date: Thu Aug 15 11:18:16 2019 -0600 Updating test baselines These tests always silently demonstrated the Pyomo#134 error. commit 4f9f44d Author: John Siirola <[email protected]> Date: Thu Aug 15 09:06:22 2019 -0600 Multiplying sets should not alter the arguments (fixes Pyomo#134) commit f76676c Author: Michael Bynum <[email protected]> Date: Thu Aug 15 07:56:30 2019 -0600 avoiding math range errors in fbbt commit 2f2a74d Merge: dab7a41 57ef5ba Author: Bethany Nicholson <[email protected]> Date: Wed Aug 14 17:01:00 2019 +0200 Merge pull request Pyomo#1085 from emma58/mpec-descend-into-disjuncts MPEC descend into disjuncts commit dab7a41 Merge: 51f165a 2b012c7 Author: John Siirola <[email protected]> Date: Tue Aug 13 16:24:33 2019 -0600 Merge pull request Pyomo#1099 from jsiirola/cython-fix Fixing typo that caused cython build failures commit 2b012c7 Author: John Siirola <[email protected]> Date: Tue Aug 13 15:06:06 2019 -0600 Changing definition of precision string to resolve cython issues commit fd1454a Author: John Siirola <[email protected]> Date: Tue Aug 13 14:19:28 2019 -0600 Changing definition of precision string to resolve cython issues commit 51f165a Merge: dda606c 10d8c57 Author: Bethany Nicholson <[email protected]> Date: Tue Aug 13 20:57:38 2019 +0200 Merge pull request Pyomo#1092 from eslickj/fix_edit Model viewer fix for editing numbers in tree views commit 55911c5 Author: John Siirola <[email protected]> Date: Mon Aug 12 15:59:20 2019 -0600 Fixing typo that caused cython build failures commit dda606c Merge: ff65c06 54c140e Author: John Siirola <[email protected]> Date: Mon Aug 12 15:43:39 2019 -0600 Merge pull request Pyomo#989 from jsiirola/remove-reciprocal Replace ReciprocalExpression with DivisionExpression commit 54c140e Merge: d8b53c1 56bdaee Author: John Siirola <[email protected]> Date: Mon Aug 12 15:17:27 2019 -0600 Merge remote-tracking branch 'refs/remotes/jsiirola/remove-reciprocal' into remove-reciprocal commit ff65c06 Merge: ceb9e35 5f4c4ab Author: John Siirola <[email protected]> Date: Mon Aug 12 11:33:58 2019 -0600 Merge pull request Pyomo#1094 from mathias-ke/patch-1 Update working_models.rst to refer to the correct example code commit 56bdaee Author: Michael Bynum <[email protected]> Date: Mon Aug 12 11:33:43 2019 -0600 Simplifying FBBT for division commit d8b53c1 Author: John Siirola <[email protected]> Date: Mon Aug 12 11:16:46 2019 -0600 Removing commented out code commit bf80f71 Author: John Siirola <[email protected]> Date: Mon Aug 12 11:13:41 2019 -0600 Removing commented code commit 561400c Merge: 5ff9fbb ceb9e35 Author: John Siirola <[email protected]> Date: Fri Aug 9 13:01:09 2019 -0600 Merge branch 'master' into remove-reciprocal commit ae49ef2 Author: reolistic <[email protected]> Date: Tue Aug 6 23:26:39 2019 +0800 update commit 5f4c4ab Author: mathias-ke <[email protected]> Date: Mon Aug 5 11:33:00 2019 +0200 Update working_models.rst Hi there, reading the doc I just noticed a duplicated entry (line 77 and line89). As I'm quite new to oemof and python I hope it is no problem that I tried to fix it this way. Have a nice week! BR Mathias commit 5d085eb Merge: ab4337d 1bef722 Author: reolistic <[email protected]> Date: Wed Jul 31 22:59:59 2019 -0400 Merge pull request #3 from qtothec/logical_fixes Changes we made on the call commit 1bef722 Author: Qi Chen <[email protected]> Date: Wed Jul 31 19:58:11 2019 -0700 changes that we made on telecon commit ab4337d Author: reolistic <[email protected]> Date: Wed Jul 31 22:20:37 2019 -0400 changes commit 10d8c57 Author: John Eslick <[email protected]> Date: Tue Jul 30 14:22:26 2019 -0400 Fix tests I hope. commit ead79f6 Author: John Eslick <[email protected]> Date: Tue Jul 30 13:16:38 2019 -0400 Fix editing numbers is the table views. commit 4d3b379 Author: reolistic <[email protected]> Date: Sun Jul 28 05:51:54 2019 -0400 new changes commit 98410ef Merge: 6450336 e5dcbbc Author: reolistic <[email protected]> Date: Wed Jul 24 22:07:15 2019 -0400 Merge branch 'master' of https://github.com/reolistic/pyomo commit 6450336 Author: reolistic <[email protected]> Date: Wed Jul 24 21:53:28 2019 -0400 setup commit ceb9e35 Merge: 6f7e00d e2cd372 Author: Bethany Nicholson <[email protected]> Date: Tue Jul 23 09:27:20 2019 -0600 Merge pull request Pyomo#1087 from andrewlee94/setting_indexed_bounds Adding methods to IndexedVar to set bounds commit e2cd372 Author: Andrew Lee <[email protected]> Date: Mon Jul 22 10:44:54 2019 -0400 Adding methods to IndexedVar to set bounds commit 6f7e00d Merge: 396af5a e486529 Author: Michael Bynum <[email protected]> Date: Fri Jul 19 18:56:53 2019 -0600 Merge pull request Pyomo#1086 from qtothec/diff_sqrt Add support for square root UnaryFunctionExpression in pyomo calculus commit e486529 Author: Qi Chen <[email protected]> Date: Thu Jul 18 14:06:14 2019 -0700 Hehe, oops. Test should test correct piece of code. commit 78e53a8 Author: Qi Chen <[email protected]> Date: Thu Jul 18 14:01:57 2019 -0700 Add test commit dbcce9c Author: Qi Chen <[email protected]> Date: Thu Jul 18 13:59:15 2019 -0700 Add support for square root UnaryFunctionExpression commit 396af5a Merge: 66874ab 5a9a5b5 Author: John Siirola <[email protected]> Date: Wed Jul 17 15:43:51 2019 -0600 Merge pull request Pyomo#983 from RomeoV/cleaning-up-OA-implementation Cleaning up mindtpy oa implementation commit e5dcbbc Author: reolistic <[email protected]> Date: Tue Jul 16 21:41:10 2019 -0400 Add files via upload commit 5a9a5b5 Author: Qi Chen <[email protected]> Date: Mon Jul 15 13:05:39 2019 -0700 Correct implementation of integer cuts for MindtPy. TODO: revisit idea of backtracking on a theoretical basis. Use assertAlmostEquals instead of assertTrue for more meaningful output commit 83465f9 Author: Qi Chen <[email protected]> Date: Mon Jul 15 10:46:23 2019 -0700 correct logical error commit 8e2c6fb Author: Qi Chen <[email protected]> Date: Mon Jul 15 10:45:50 2019 -0700 Romeo had rewritten int_to_binary to support negative integer domains. This commit codifies that as an official capability. commit 41f95f8 Author: Qi Chen <[email protected]> Date: Mon Jul 15 10:37:39 2019 -0700 revert unnecessary whitespace change commit c113833 Author: Qi Chen <[email protected]> Date: Mon Jul 15 08:42:22 2019 -0700 Restore previous functionality in int_to_binary By adding a new flag commit 57ef5ba Merge: 1bfc31c 66874ab Author: Emma Johnson <[email protected]> Date: Fri Jul 12 16:39:01 2019 -0400 Merge branch 'master' into mpec-descend-into-disjuncts commit 1bfc31c Author: Emma Johnson <[email protected]> Date: Fri Jul 12 16:35:33 2019 -0400 Removing debugging import... commit eae791b Author: Emma Johnson <[email protected]> Date: Fri Jul 12 16:30:09 2019 -0400 Testing that the result of each of the mpec transformations is the same regardless of whether they were called on the whole model or just the Block where the Complementarity lives commit d0b63c8 Author: Emma Johnson <[email protected]> Date: Fri Jul 12 16:29:18 2019 -0400 Looking for free variables on the entire model, not just on instance since it may have been a Block or a Disjunct commit 78d05dd Author: reolistic <[email protected]> Date: Fri Jul 12 15:08:46 2019 -0400 Add files via upload commit 0310bda Author: Emma Johnson <[email protected]> Date: Thu Jun 20 19:30:26 2019 -0400 Adding descent into Disjuncts to find Complementarity components in all the mpec transformations commit 3c8640d Author: Emma Johnson <[email protected]> Date: Thu Jun 20 18:19:35 2019 -0400 Adding tests to check if complementarity constraints get transformed as if we had called transformation on m.disjunct rather than m commit 0946184 Merge: 4b8d692 e225b78 Author: Romeo Valentin <[email protected]> Date: Fri May 10 14:56:30 2019 -0400 Merge branch 'cleaning-up-OA-implementation' of github.com:RomeoV/pyomo into cleaning-up-OA-implementation commit 4b8d692 Author: Romeo Valentin <[email protected]> Date: Fri May 10 14:56:06 2019 -0400 Fixed some of Qi's comments commit e225b78 Merge: 52a8462 1fcd664 Author: John Siirola <[email protected]> Date: Thu May 9 16:08:24 2019 -0600 Merge branch 'master' into cleaning-up-OA-implementation commit 52a8462 Merge: a917a5e 5b0a366 Author: RomeoV <[email protected]> Date: Wed May 8 14:38:49 2019 -0400 Merge branch 'master' into cleaning-up-OA-implementation commit a917a5e Author: Romeo Valentin <[email protected]> Date: Fri May 3 15:55:26 2019 -0400 Added docstring to old OA-cut method commit ead4260 Author: Romeo Valentin <[email protected]> Date: Fri May 3 15:49:29 2019 -0400 Fix rounding incompatability for python2 commit b2b9cf2 Author: Romeo Valentin <[email protected]> Date: Thu May 2 16:42:46 2019 -0400 Replace manual fixing by TransformationFactory commit ed3a73e Author: Romeo Valentin <[email protected]> Date: Thu May 2 15:46:15 2019 -0400 Added a lot more tests for OA commit 2758e46 Author: Romeo Valentin <[email protected]> Date: Thu May 2 15:45:12 2019 -0400 Integers can be any (integer) bound, i.e. [-4,4] instead of [0,8] commit 3960ada Author: Romeo Valentin <[email protected]> Date: Thu May 2 15:44:52 2019 -0400 Add support for integer variables (not just binaries) commit 5ff9fbb Author: John Siirola <[email protected]> Date: Wed May 1 22:33:18 2019 -0600 Tracking changes in master commit 07f345c Merge: d921d62 dcdc3de Author: John Siirola <[email protected]> Date: Wed May 1 19:43:53 2019 -0600 Merge branch 'master' into remove-reciprocal commit b79ecdc Author: Romeo Valentin <[email protected]> Date: Wed May 1 22:34:54 2019 -0400 Extended tests with more (already implemented) examples commit 182c760 Author: Romeo Valentin <[email protected]> Date: Wed May 1 17:33:44 2019 -0400 Updated create_oa_cut method commit 95761c0 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 22:51:18 2019 -0400 Renamed current OA, moved special PSC code to if Note that currently the tests will fail because no implementation for create_oa_cut is available. commit 434db65 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 19:41:37 2019 -0400 Split up the master solve method commit b0acf71 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 19:01:47 2019 -0400 Minor naming changes commit 0a22782 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 18:50:07 2019 -0400 Add some comments and todos commit 875ef00 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 18:37:30 2019 -0400 Support force-copying floats to binaries if specified commit 2a1c339 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 18:03:17 2019 -0400 Only pass solver result to hander if neccesary commit ab54185 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 18:02:10 2019 -0400 Add documentation to each NLP solver method commit 832cc44 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 17:18:29 2019 -0400 Fixed wrong indentations commit 9aecf19 Author: Romeo Valentin <[email protected]> Date: Tue Apr 30 16:57:42 2019 -0400 Broke down the solve_nlp method into solve and handle parts commit d921d62 Merge: 8f6e863 55bed8d Author: John Siirola <[email protected]> Date: Fri Apr 26 19:51:52 2019 -0600 Merge branch 'master' into remove-reciprocal commit 8f6e863 Author: John Siirola <[email protected]> Date: Fri Apr 26 19:03:38 2019 -0600 Replace ReciprocalExpression with DivisionExpression
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #134
Summary/Motivation:
Multiplying a
_SetProductby another Set would change the original_SetProductargument. This resolves that issue by duplicating the underlying set_tuple list.Supersedes #1101.
Changes proposed in this PR:
_SetProductfrom another_SetProduct.Legal Acknowledgement
By contributing to this software project, I agree to the following terms and conditions for my contribution: