Matrix bug fixes and API test #86
Conversation
|
|
||
| _tmpWeight = _edgeWeight + _entryWeight; | ||
|
|
||
| if (_msptSubItem.weight > _tmpWeight || _msptSubItem.weight == 0.0) { | ||
| if (_msptSubItem.weight > _tmpWeight || _msptSubItem.weight == Double.POSITIVE_INFINITY) { |
There was a problem hiding this comment.
I think just _msptSubItem.weight > _tmpWeight is necessary
| @@ -275,19 +290,18 @@ private void fillEdgesUpward(MultiTreeSPEntry currEdge, PriorityQueue<MultiTreeS | |||
| _msptItem = currEdge.getItem(i); | |||
| _entryWeight = _msptItem.weight; | |||
|
|
|||
| if (_entryWeight == 0.0) | |||
| if (_entryWeight == Double.POSITIVE_INFINITY) | |||
There was a problem hiding this comment.
You should use Double.isInfinity instead
There was a problem hiding this comment.
If you look at the implementation of Double.isInfinite, it its
return var0 == 1.0D / 0.0 || var0 == -1.0D / 0.0;
}
of which 50% is the definition of Double.POSITIVE_INFINITY:
public static final double POSITIVE_INFINITY = 1.0D / 0.0;
As I do not want to accept Double.NEGATIVE_INFINITY, which would hint at an error in my code, I am happy to use my version, which should be faster as well.
| } | ||
|
|
||
| @Test | ||
| public void distanceTest() { |
There was a problem hiding this comment.
Can we write a bit of documentation about what the test is for?
| double matrixDistance = jDistances.getJSONArray(i).getDouble(j); | ||
| Assert.assertTrue( matrixDistance - .1 < routeDistance); | ||
| Assert.assertTrue( matrixDistance + .1 > routeDistance); | ||
| // .assertThat() |
There was a problem hiding this comment.
We should try and make sure that we don't leave commented out code when we push to dev/master
| @@ -21,6 +21,7 @@ | |||
| package heigit.ors.services.matrix; | |||
|
|
|||
| import static io.restassured.RestAssured.*; | |||
| import static org.hamcrest.Matchers.*; | |||
There was a problem hiding this comment.
Do any objects from this package get used? If not then it shouldn't be imported.
fixes issues of #63 and adds an api test for matrix