Skip to content
Snippets Groups Projects
Commit 4d5c6c38 authored by Bryan Cazabonne's avatar Bryan Cazabonne
Browse files

Fixed code smells.

parent 75907752
No related branches found
No related tags found
No related merge requests found
......@@ -75,9 +75,6 @@ public class ICGEMFormatReader extends PotentialCoefficientsReader {
/** Format. */
private static final String FORMAT = "format";
/** Supported formats. */
private static final String SUPPORTED_FORMAT = "icgem(\\d+\\.\\d+)";
/** Maximum supported formats. */
private static final double MAX_FORMAT = 2.0;
......@@ -147,6 +144,9 @@ public class ICGEMFormatReader extends PotentialCoefficientsReader {
/** Pattern for delimiting regular expressions. */
private static final Pattern SEPARATOR = Pattern.compile("\\s+");
/** Pattern for supported formats. */
private static final Pattern SUPPORTED_FORMAT = Pattern.compile("icgem(\\d+\\.\\d+)");
/** Flag for Gravitational coefficient. */
private static final int MU = 0x1;
......@@ -238,7 +238,7 @@ public class ICGEMFormatReader extends PotentialCoefficientsReader {
final String[] tab = SEPARATOR.split(line);
if (inHeader) {
if (tab.length >= 2 && FORMAT.equals(tab[0])) {
final Matcher matcher = Pattern.compile(SUPPORTED_FORMAT).matcher(tab[1]);
final Matcher matcher = SUPPORTED_FORMAT.matcher(tab[1]);
if (matcher.matches()) {
version = Double.parseDouble(matcher.group(1));
if (version > MAX_FORMAT) {
......
......@@ -690,8 +690,8 @@ public abstract class PotentialCoefficientsReader implements DataLoader {
GravityFieldFactory.getUnnormalizationFactors(rescaledFlattener.getDegree(),
rescaledFlattener.getOrder());
generator = wantNormalized ?
(n, m) -> scale / unnormalizationFactors[n][m] :
(n, m) -> scale * unnormalizationFactors[n][m];
(n, m) -> scale / unnormalizationFactors[n][m] :
(n, m) -> scale * unnormalizationFactors[n][m];
}
// perform rescaling
......@@ -744,8 +744,8 @@ public abstract class PotentialCoefficientsReader implements DataLoader {
GravityFieldFactory.getUnnormalizationFactors(rescaledFlattener.getDegree(),
rescaledFlattener.getOrder());
generator = wantNormalized ?
(n, m) -> 1.0 / unnormalizationFactors[n][m] :
(n, m) -> unnormalizationFactors[n][m];
(n, m) -> 1.0 / unnormalizationFactors[n][m] :
(n, m) -> unnormalizationFactors[n][m];
}
// perform rescaling
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment