Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xpress NLP solver implementation #205

Merged
merged 110 commits into from
May 17, 2023
Merged
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
b4950e9
Adding to_str to utils
RaphMota Mar 23, 2023
0b10a40
Xpress NLP structures and functions
RaphMota Mar 30, 2023
27fdb95
solving PR issues
RaphMota Apr 3, 2023
9e09d15
to_str modified for SLP
RaphMota Apr 5, 2023
8e8f4dd
adding constraint_to_expr
RaphMota Apr 5, 2023
5589d75
to_str modified for nlp right format
RaphMota Apr 10, 2023
c2c55fb
New version of Xpress
RaphMota Apr 10, 2023
ea37e58
removing to_str in optimize!
RaphMota Apr 10, 2023
07b1bfb
to_constraint_set added
RaphMota Apr 12, 2023
3ab2aa6
objective_value update
RaphMota Apr 12, 2023
d512edb
nlp case added to status
RaphMota Apr 12, 2023
2bf2300
getnlpsol edited
RaphMota Apr 12, 2023
63df39e
corrections
RaphMota Apr 12, 2023
3ff7d96
corrections
RaphMota Apr 12, 2023
a8c51e8
reset_cached_solution updated
RaphMota Apr 12, 2023
cc11ada
getnlpsol updated
RaphMota Apr 12, 2023
e69116b
correcting indentation
RaphMota Apr 12, 2023
22100fa
Status issue solved
RaphMota Apr 13, 2023
32cfbea
Status issue corrections
RaphMota Apr 13, 2023
e25e37c
solving shadow price issue
RaphMota Apr 13, 2023
31a2544
nlp updated
RaphMota Apr 13, 2023
a1e1d1b
NonlinearConstraintRef added
RaphMota Apr 13, 2023
522ca95
NonlinearConstraintRef added
RaphMota Apr 13, 2023
51dbd76
NonlinearConstraintRef added
RaphMota Apr 13, 2023
622bcc9
corrections shadow price
RaphMota Apr 13, 2023
485d9c4
corrections shadow price
RaphMota Apr 13, 2023
beb7116
Objective value and value fixed
RaphMota Apr 13, 2023
466400c
Objective value and value fixed
RaphMota Apr 13, 2023
d3f2342
get NLPBlockDual added
RaphMota Apr 13, 2023
dcc274e
nlp.jl fixed
RaphMota Apr 13, 2023
618c077
cleaning constraints before optimizing
RaphMota Apr 14, 2023
c8b1269
cleaning constraints before optimizing
RaphMota Apr 14, 2023
2d02097
cleaning constraints before optimizing
RaphMota Apr 14, 2023
4094685
cleaning constraints before optimizing
RaphMota Apr 14, 2023
2b7d691
cleaning constraints before optimizing
RaphMota Apr 14, 2023
8f80430
cleaning constraints before optimizing
RaphMota Apr 14, 2023
2719ba3
removing useless functions from nlp.jl
RaphMota Apr 17, 2023
8910845
solving dict issue
RaphMota Apr 17, 2023
69d2fd8
Solving importation issues
RaphMota Apr 17, 2023
3fd5da3
Fixing dual
RaphMota Apr 17, 2023
04341a3
tests added
RaphMota Apr 17, 2023
d2913b0
module issue solved
RaphMota Apr 17, 2023
a707d00
solving tests issues
RaphMota Apr 17, 2023
4c7c230
solving tests issues
RaphMota Apr 17, 2023
55ec895
Solving test issues
RaphMota Apr 18, 2023
6ca4f47
Case with only NLObjective
RaphMota Apr 18, 2023
91972d8
Case with only NLObjective
RaphMota Apr 18, 2023
8b814ff
Case with only NLObjective
RaphMota Apr 18, 2023
bc9f86a
cached primal updated
RaphMota Apr 18, 2023
2a01dbb
solving problems
RaphMota Apr 18, 2023
5221cd9
solving problems
RaphMota Apr 18, 2023
94ccd54
solving problems
RaphMota Apr 18, 2023
e18202d
test dummy nlp fixed
RaphMota Apr 18, 2023
d6e5c7c
test dummy nlp fixed
RaphMota Apr 18, 2023
b368806
Importations
RaphMota Apr 18, 2023
59c093e
Importations
RaphMota Apr 18, 2023
bddf6a8
set_bounds fixed
RaphMota Apr 18, 2023
951129a
Solving add_constraints
RaphMota Apr 18, 2023
6b7eddd
Fixing warnings
RaphMota Apr 19, 2023
b023647
Fixing warnings
RaphMota Apr 19, 2023
db6046f
fix warnings
RaphMota Apr 19, 2023
01d9b71
fix warnings
RaphMota Apr 19, 2023
fe35d6d
Removing useless functions
RaphMota Apr 19, 2023
6beaf0a
Removing useless functions
RaphMota Apr 19, 2023
72e6b27
Removing useless functions
RaphMota Apr 19, 2023
8f8ce60
Dual issue fixed
RaphMota Apr 19, 2023
1187bc9
Dual issue fixed
RaphMota Apr 19, 2023
54d5a7c
Editing optimize!
RaphMota Apr 19, 2023
5a4c16d
Editing optimize!
RaphMota Apr 19, 2023
6ba1623
Editing optimize!
RaphMota Apr 19, 2023
a2252ed
Editing optimize!
RaphMota Apr 19, 2023
f55b323
Editing optimize!
RaphMota Apr 19, 2023
fbaf3e3
Invalid Evaluator case fixing
RaphMota Apr 20, 2023
003785d
Invalid Evaluator case fixing
RaphMota Apr 20, 2023
bb5011b
Invalid Evaluator case fixing
RaphMota Apr 20, 2023
b7aa2f5
testing XPRSnlpoptimize
RaphMota Apr 20, 2023
263a075
testing XPRSnlpoptimize
RaphMota Apr 20, 2023
ab54b2e
changing runtests
RaphMota Apr 20, 2023
d162414
changing runtests
RaphMota Apr 20, 2023
5f71dac
changing runtests
RaphMota Apr 20, 2023
efb41b8
changing runtests
RaphMota Apr 20, 2023
34bb185
fixing empty!
RaphMota Apr 20, 2023
24f5736
Removing test_temp
RaphMota Apr 20, 2023
308359b
Removing test_temp
RaphMota Apr 20, 2023
fd7313f
Removing test_temp
RaphMota Apr 20, 2023
9666414
Solving callbacks issues
RaphMota Apr 20, 2023
1c9bb87
Solving callbacks issues
RaphMota Apr 20, 2023
b6f4d71
Updating Base.Show
RaphMota Apr 24, 2023
b8489b4
Updating Base.Show
RaphMota Apr 24, 2023
87486ca
callbacks issues
RaphMota Apr 24, 2023
3b5f717
callbacks issues
RaphMota Apr 24, 2023
a40a8dc
callbacks issues
RaphMota Apr 24, 2023
b32d870
callbacks issues
RaphMota Apr 24, 2023
3dfb750
callbacks issues
RaphMota Apr 24, 2023
23274ee
callbacks issues
RaphMota Apr 24, 2023
7ac249b
callbacks issues
RaphMota Apr 24, 2023
7e2fe52
callbacks issues
RaphMota Apr 24, 2023
95cb037
callbacks issues
RaphMota Apr 24, 2023
c1f109f
callbacks issues
RaphMota Apr 24, 2023
c3fb08e
callbacks issues
RaphMota Apr 24, 2023
715b265
callbacks issues
RaphMota Apr 24, 2023
7361241
callbacks issues
RaphMota Apr 24, 2023
2aff439
callbacks issues
RaphMota Apr 24, 2023
01c3263
callbacks issues
RaphMota Apr 24, 2023
e98be7f
callbacks tests
RaphMota Apr 24, 2023
014ed0b
callbacks tests
RaphMota Apr 24, 2023
13bcade
Updating helper
RaphMota Apr 24, 2023
cec749b
Updating helper
RaphMota Apr 24, 2023
7f0da88
Base show updated
RaphMota Apr 24, 2023
7f67de0
Merge branch 'jg/nlp' into master
joaquimg May 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updating Base.Show
RaphMota committed Apr 24, 2023
commit b8489b4b9c26d2b9d0af3b2138edb1d079b111fe
4 changes: 2 additions & 2 deletions src/helper.jl
Original file line number Diff line number Diff line change
@@ -276,13 +276,13 @@ function is_nonlinear(prob::XpressProblem)
buffer = Array{Cchar}(undef, 80)
buffer_p = pointer(buffer)
out = Cstring(buffer_p)
ret=XPRSnlpgetformulastring(prob, Cint(0), out , 80)
ret=Lib.XPRSnlpgetformulastring(prob, Cint(0), out , 80)
version = unsafe_string(out)::String

buffer= Array{Cchar}(undef, 80)
buffer_p = pointer(buffer)
out = Cstring(buffer_p)
ret=XPRSnlpgetobjformulastring(prob, out , 80)
ret=Lib.XPRSnlpgetobjformulastring(prob, out , 80)
version_obj = unsafe_string(out)::String

if version == "" && version_obj == ""