TSPLIbImporter support row-tours and fix distance function for EDGE_WEIGHT_TYPE GEO #1080
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
Add test cases to cover a tour defined in a row.
…1064) The conversion function from sexagesimal/base60 value to radian decimal values in TSPLIBImporter computeRadiansAngle() had a bug when splitting the sexagesimal/base60 value into its degree and minute part. The integer degree part must be computed by truncating the decimal part of the double value (by casting it to an int) instead of rounding it to the next integer value. In case the value was rounded upwards (in case of a negative value rounded downwards) the minute part (which is then subtracted) becomes bigger than it should be. This is caused by the non-steadiness of the conversion from decimal degrees to sexagesimal/base60 degree values. Updated and extended the test-cases accordingly.
HannesWell
force-pushed
the
tsplibFixDistanceFunctionGeo
branch
from
b929275
to
0d70ff1
Compare
HannesWell
commented
Apr 17, 2021
| double deg = (int) x; // integer degree part | ||
| double min = x - deg; // decimal part represents the minutes of arc | ||
| if (0.60 < Math.abs(min)) { | ||
| throw new IllegalArgumentException( |
There was a problem hiding this comment.
This let the import of ali535.tsp fail because it contains the following three lines:
187 33.56 45.80
429 48.31 -24.80
501 40.62 13.11
In each line one coordinate has a decimal part greater 0.6. But since the decimal part represents the minutes of arc of the degree value it must not be greater 0.6. So from my perspective the TSP-instance is malformed.
Alternatively only a corresponding message could be printed or it could configurable if the algorithm should only print an error or should throw an exception. That's not nice but at least the import of ali535 would work.
Another way would be to contact the Uni Heidelberg ask them to fix this instance.
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.
This PR provides a fix for issue #1064 and adds supports for TSPLIB files that contain a tour whose node list is a row. Until know only tours with a node list as column were supported. The latter is one task of the umbrella issue #1067.
Additionally the corresponding tests are adjusted and extended.
HISTORY.mdorCONTRIBUTORS.md