Skip to content

Conversation

@trigaut
Copy link
Member

@trigaut trigaut commented Aug 16, 2016

Modify the way constraints are handled in SDP.
It is not necessary anymore to add the state constraints to the constraints function.
This PR should be merged quickly as the previous implementation will create issues in problem instances with constraints mixing states and controls

trigaut added a commit that referenced this pull request Aug 16, 2016
@trigaut trigaut mentioned this pull request Aug 16, 2016
(next_state[i]>=model.xlim[i][1])&&
(next_state[i]<=model.xlim[i][2]))
end

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you DRY this pattern (as you use it more than once)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will put it in SDPutils ok

@codecov-io
Copy link

codecov-io commented Aug 16, 2016

Current coverage is 93.85% (diff: 100%)

Merging #111 into dev-nightly will increase coverage by 0.06%

@@           dev-nightly       #111   diff @@
=============================================
  Files               10         10          
  Lines              676        683     +7   
  Methods              0          0          
  Messages             0          0          
  Branches             0          0          
=============================================
+ Hits               634        641     +7   
  Misses              42         42          
  Partials             0          0          

Powered by Codecov. Last update 803cc6f...930b188

@frapac
Copy link
Member

frapac commented Aug 16, 2016

Ok to merge

@trigaut trigaut merged commit cfdd952 into dev-nightly Aug 16, 2016
@trigaut trigaut deleted the fix_sdp_bad_constraint_handling branch August 16, 2016 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants