Solves #367 by reimplementing morris sampling method following SALib implementation to avoid parameters getting out of bounds #369
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
chapuisk
added
😱 Bug
![codescene-delta-analysis[bot]](https://avatars.githubusercontent.com/in/53921?s=60&v=4){kind=small}
| @@ -1,15 +1,20 @@ | |||
| package gama.core.kernel.batch.exploration.sampling; | |||
|
|
|||
| import java.util.ArrayList; | |||
| import java.util.Arrays; | |||
There was a problem hiding this comment.
✅ Getting better: Code Duplication
reduced similar code in: trajectoryBuilder,trajectoryBuilder
| @@ -1,15 +1,20 @@ | |||
| package gama.core.kernel.batch.exploration.sampling; | |||
|
|
|||
| import java.util.ArrayList; | |||
| import java.util.Arrays; | |||
There was a problem hiding this comment.
ℹ Getting worse: Primitive Obsession
The ratio of primitive types in function arguments increases from 48.57% to 55.56%, threshold = 30.0%
Comment on lines
-57
to
-75
| private static List<Object> trajectoryBuilder(final double delta, final List<Integer> order, final List<Integer> direction, | ||
| final List<Double> seed, final List<List<Double>> accPoints, final List<Double> accdelta, final int index) { | ||
| if (order.isEmpty()) { | ||
| List<Object> trajectory = new ArrayList<>(); | ||
| trajectory.add(accPoints); | ||
| trajectory.add(accdelta); | ||
| return trajectory; | ||
| } | ||
| int idx = order.get(0); | ||
| double deltaOriented = delta * direction.get(0); | ||
| double valTemp = seed.get(idx) + deltaOriented; | ||
| List<Double> new_seed = new ArrayList<>(seed); | ||
| new_seed.set(idx, valTemp); | ||
| order.remove(0); | ||
| direction.remove(0); | ||
| accPoints.add(new_seed); | ||
| accdelta.add(deltaOriented); | ||
| return trajectoryBuilder(delta, order, direction, new_seed, accPoints, accdelta, index + 1); | ||
| } |
There was a problem hiding this comment.
✅ No longer an issue: Excess Number of Function Arguments
trajectoryBuilder is no longer above the threshold for number of arguments
Comment on lines
-125
to
-130
| private static List<Trajectory> addTrajectories(final int k, final int p, final int r, final Random rng, | ||
| final List<Trajectory> acc) { | ||
| if (r == 0) return acc; | ||
| acc.add(makeTrajectory(k, p, rng)); | ||
| return addTrajectories(k, p, r - 1, rng, acc); | ||
| } |
There was a problem hiding this comment.
✅ No longer an issue: Excess Number of Function Arguments
addTrajectories is no longer above the threshold for number of arguments
Comment on lines
+126
to
+130
| private static List<Trajectory> morrisTrajectories(final int k, final int p, final int r, final Random rng, final List<Trajectory> acc) { | ||
| if (r == 0) return acc; | ||
| acc.add(generateTraj(k, p, rng)); | ||
| return morrisTrajectories(k, p, r - 1, rng, acc); | ||
| } |
There was a problem hiding this comment.
ℹ New issue: Excess Number of Function Arguments
morrisTrajectories has 5 arguments, threshold = 4
lesquoyb
changed the title
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.
The sampling method for Morris was made out of a 'simplification' of the original matrix based formula. The new implementation is retro-engineered from SALib (MIT Licence) implementation.