update for JuMP v0.14 and Julia v0.5 #69
Merged
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
Current coverage is 84.33% (diff: 100%)@@ master #69 diff @@
==========================================
Files 15 15
Lines 1332 1334 +2
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
+ Hits 1121 1125 +4
+ Misses 211 209 -2
Partials 0 0
|
IainNZ
requested changes
Oct 12, 2016
| @@ -222,8 +222,6 @@ const ADP = "an adaptive variable" | |||
| (-)(lhs::UncExpr, rhs::Variable) = UncVarExpr([rhs],[UncExpr(-1)],lhs) | |||
| (*)(lhs::UncExpr, rhs::Variable) = (*)(rhs,lhs) | |||
| (/)(lhs::UncExpr, rhs::Variable) = error("Cannot divide $UNE by a variable") | |||
| # UncExpr--GenericNormExpr | |||
| (/){P,C,V<:Uncertain}(lhs::UncExpr, rhs::GenericNormExpr{P,C,V}) = error("Cannot divide $UNE by $UNM") | |||
There was a problem hiding this comment.
dup of
Line 236 in abcf0a6
| julia 0.4 | ||
| JuMP 0.13.2 0.14 | ||
| julia 0.5 | ||
| JuMP 0.14 |
| @@ -269,8 +267,6 @@ const ADP = "an adaptive variable" | |||
| (-)(lhs::UncVarExpr, rhs::Variable) = UncVarExpr(vcat(lhs.vars,rhs),vcat(lhs.coeffs,UncExpr(-1)), lhs.constant) | |||
| (*)(lhs::UncVarExpr, rhs::Variable) = error("Cannot multiply $UVE by a variable") | |||
| (/)(lhs::UncVarExpr, rhs::Variable) = error("Cannot divide $UVE by a variable") | |||
| # UncVarExpr--GenericNormExpr | |||
| (/){P,C,V<:Uncertain}(lhs::UncVarExpr, rhs::GenericNormExpr{P,C,V}) = error("Cannot divide $UVE by $UNM") | |||
There was a problem hiding this comment.
dup of
Line 286 in abcf0a6
|
Thanks for doing this! |
IainNZ
approved these changes
Oct 14, 2016
|
Will tag now |
|
Actually, can you tag? |
Closed
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.
Closes #67 and #68. Summary of Changes:
UTF8String->Stringutf8()symvarnameto deal with "variable not defined"JuMP.registercon()stub for uncset constraints to work withJuMP.@constraint