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

Fix typo, add getGradient, add package.xml to build in catkin workspaces #109

Merged
merged 13 commits into from
Jan 10, 2022

Conversation

wxmerkt
Copy link
Contributor

@wxmerkt wxmerkt commented Dec 11, 2021

  • Fixes typos including in method names
  • Add getGradient to return the last gradient
  • Adds a package.xml to build in catkin/colcon workspaces

package.xml Outdated Show resolved Hide resolved
Copy link
Member

@traversaro traversaro left a comment

Choose a reason for hiding this comment

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

Some comments, thanks in any case!

package.xml Show resolved Hide resolved
wxmerkt and others added 2 commits December 12, 2021 15:06
@wxmerkt wxmerkt removed their assignment Dec 12, 2021
@wxmerkt wxmerkt requested a review from traversaro December 16, 2021 20:51
package.xml Outdated
<?xml version="1.0"?>
<package format="3">
<name>osqp-eigen</name>
<version>0.6.2</version>
Copy link
Member

Choose a reason for hiding this comment

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

Again, not blocking the merge but I am tipically afraid of multiple places in which the version is defined. @GiulioRomualdi note that this may need to be updated for every new release, if necessary we can setup tooling to do this automatically.

Copy link
Member

@traversaro traversaro Jan 7, 2022

Choose a reason for hiding this comment

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

Otherwise we can modify the CMake to read the version from package.xml, for example dart is doing it via:

# Extract version numbers from package.xml
file(READ package.xml PACKAGE_XML)
string(REGEX MATCH "<version>[0-9]+\\.[0-9]+\\.[0-9]+</version>" DIRTY_VERSION_STRING ${PACKAGE_XML})
string(REGEX REPLACE "^<version>([0-9]+)\\.([0-9]+)\\.([0-9]+)</version>$" "\\1" DART_MAJOR_VERSION "${DIRTY_VERSION_STRING}")
string(REGEX REPLACE "^<version>([0-9]+)\\.([0-9]+)\\.([0-9]+)</version>$" "\\2" DART_MINOR_VERSION "${DIRTY_VERSION_STRING}")
string(REGEX REPLACE "^<version>([0-9]+)\\.([0-9]+)\\.([0-9]+)</version>$" "\\3" DART_PATCH_VERSION "${DIRTY_VERSION_STRING}")
set(DART_VERSION "${DART_MAJOR_VERSION}.${DART_MINOR_VERSION}.${DART_PATCH_VERSION}")

see https://github.com/dartsim/dart/blob/f07186fbdb4e89e5340abb9718d02715bb315922/CMakeLists.txt#L62 .

But perhaps this brings more complexity that it is worth.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would you like me to add this to this PR or is this a comment to keep track of for future reference?

Copy link
Member

Choose a reason for hiding this comment

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

Hi @wxmerkt, it would be nice if you could add this modification. In this case, I would also like to ask you to modify the version in the package.xml to 0.6.4.100. We will release 0.7.0 soon

Copy link
Contributor Author

@wxmerkt wxmerkt Jan 7, 2022

Choose a reason for hiding this comment

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

I don't think package.xml or semver supports a third period (beyond patch release). How about 0.6.5?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've made the requested updates. Note that the version convention won't allow 0.6.4.100. It has to be major-minor-patch. Hence, I've used 0.6.4.

Copy link
Member

@GiulioRomualdi GiulioRomualdi left a comment

Choose a reason for hiding this comment

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

Hi @wxmerkt, thank you very much for the contribution! I've added just a comment regarding the deprecation of the methods you modified.

include/OsqpEigen/Settings.hpp Outdated Show resolved Hide resolved
@wxmerkt wxmerkt requested a review from GiulioRomualdi January 4, 2022 13:30
@GiulioRomualdi
Copy link
Member

Thank you very much @wxmerkt for the effort, I am going to merge it 😃

@GiulioRomualdi GiulioRomualdi merged commit 255305d into robotology:master Jan 10, 2022
@traversaro traversaro mentioned this pull request Dec 1, 2022
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.

3 participants