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.

Sign up for GitHub

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

Jump to bottom

Merge Devel into Master #66

Merged
merged 46 commits into from
Jun 9, 2020
Merged

Merge Devel into Master #66

merged 46 commits into from
Jun 9, 2020

Conversation

GiulioRomualdi
Copy link
Member

I would like to merge devel into master and release the software.
The new release version will be 0.6.1 If you agree I dump the version on the CMakeLists and I will create the new tag

chibi314 and others added 30 commits February 6, 2020 12:16
@chibi314 @S-Dafarra
Add new api: getDualSolution
b856cb3
@chibi314 @S-Dafarra
Fix m_dual_solution to cammel case
2e1044e
@S-Dafarra
Bumped patch version.
2616cf2
@GiulioRomualdi
Merge pull request #50 from S-Dafarra/add_get_dual_solution_is_back
338447d 
Get back the dual solution
@S-Dafarra
Using nullptr to avoid static assert on test names.
eecf180
@GiulioRomualdi
Merge pull request #56 from S-Dafarra/fix/testNames
50154d5 
Using nullptr to avoid static assert on test names.
@GiulioRomualdi
Add OsqpEigenFindDependencies.cmake file
0668894
@GiulioRomualdi
Add cmake utility for enabling the tests
971f10f
@GiulioRomualdi
Use Catch2 instead of Google Test in the existing tests
9e66010
@GiulioRomualdi
Update the main CMakeLists.txt accordingly to 971f10f and 0668894
6dfc694
@GiulioRomualdi
Update the README.md
7a49a92
@GiulioRomualdi
Remove FindEigen3.cmake file
147c69e
@GiulioRomualdi
Move the definition of the dependencies in a separate file
db75a18
@GiulioRomualdi
- required c++14 for compiling the tests
24b77ca 
- remove useless cmake options in add_osqpeigen_test cmake function
@GiulioRomualdi
Disable Disable C and C++ compiler extensions in the main CMakeLists.…
bae52d3 
…txt file
@GiulioRomualdi
Require C++14 for compiling osqp-eigen
69a410a
@GiulioRomualdi
Change the cmake file accordingly to db75a18
e7ce5b1
@GiulioRomualdi
Set default build type to "Release"
8e5ab07
@GiulioRomualdi
Include cmath in MPCTest.cpp
88a0ed2
@GiulioRomualdi
Add compile definitions input to the add_osqpeigen_test function
5c27d0e
@GiulioRomualdi
Add missing include in MPCUpdateMatricesTest.cpp
c08ceec
@GiulioRomualdi
Link Eigen3 as public library
bc4b784
@GiulioRomualdi
Pass the namespace as input of the install_basic_package_files function
a46208a
@GiulioRomualdi
Merge pull request #59 from robotology/feature/catch2
120f466 
Move from google test to catch2
@GiulioRomualdi
Add CI pipeline with Github Actions
c336b19
@GiulioRomualdi
Remove travis and appveyor CI systems
3d6896c
@GiulioRomualdi
Update the README.md removing the Travis and Appveyor badges and addi…
9844e6f 
…ng GitHub CI one
@GiulioRomualdi
Merge pull request #30 from robotology/feature/add-github-action-ci
4728e50 
Add CI pipeline with Github Actions
@S-Dafarra
Check that all the settings are actually available.
0e7284b 
Add time limit setting.
@S-Dafarra
Bumped patch version.
6e1e14e
GiulioRomualdi and others added 15 commits May 14, 2020 16:30
@GiulioRomualdi
Merge pull request #52 from S-Dafarra/fix/check_settings
2eda1ea 
Check that all the settings are actually available.
@S-Dafarra
Forcing the input eigen matrix to be csc when copying it into an osqp…
9f92bdb 
… matrix.
@S-Dafarra
Removed unused pointers.
7f3ec5f
@S-Dafarra
Added test where we use a CSR matrix.
4c5ea47
@S-Dafarra
Bump minor version.
2dcec5e
@GiulioRomualdi
Merge pull request #57 from S-Dafarra/fix/force_csc
d27c484 
Forcing the input eigen matrix to be csc when copying it into an osqp matrix
@S-Dafarra
Properly exporting Eigen dependency.
9cae402 
credits @traversaro.
@GiulioRomualdi
Merge pull request #62 from S-Dafarra/fix/eigenDependency
a8318c1 
Properly exporting Eigen dependency.
@mpowelson
Expose OSQP Workspace
3d689f2
@GiulioRomualdi
Check the initialization of the solver went fine while updating hessi…
48a9bc6 
…an and constraint matrix
@GiulioRomualdi
Dump version 0.6.103 -> 0.6.104
222a525
@GiulioRomualdi
Merge pull request #64 from robotology/fix/solver_initialization
21bfc9e 
Check the initialization of the solver went fine while updating hessian and constraint matrix
@GiulioRomualdi
Merge pull request #63 from mpowelson/feature/expose_workspace
8aa7b4d 
Expose OSQP Workspace
@GiulioRomualdi
Add the gh-pages workflow
0e8c737
@GiulioRomualdi
Merge pull request #65 from robotology/action/gh-page
7837339 
Add the gh-pages Workflow
@GiulioRomualdi GiulioRomualdi self-assigned this Jun 9, 2020
@GiulioRomualdi GiulioRomualdi changed the title Devel into Master Merge Devel into Master Jun 9, 2020
@GiulioRomualdi GiulioRomualdi merged commit bba25ca into master Jun 9, 2020
@GiulioRomualdi GiulioRomualdi deleted the devel branch December 4, 2020 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@S-Dafarra S-Dafarra S-Dafarra approved these changes

@traversaro traversaro Awaiting requested review from traversaro

Assignees

@GiulioRomualdi GiulioRomualdi

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GiulioRomualdi @S-Dafarra @chibi314 @mpowelson