This is an automated email from the ASF dual-hosted git repository. aherbert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-statistics.git
commit 899a275f5d567c6a7bffb04c5a41d301b568032f Author: aherbert <[email protected]> AuthorDate: Wed Dec 15 17:17:46 2021 +0000 Change survival to sf in the distribution examples application --- commons-statistics-examples/examples-distribution/HOWTO.md | 2 +- .../commons/statistics/examples/distribution/BetaCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/BinomialCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/CauchyCommand.java | 8 ++++---- .../statistics/examples/distribution/ChiSquaredCommand.java | 8 ++++---- .../statistics/examples/distribution/DistributionFunction.java | 2 +- .../statistics/examples/distribution/DistributionUtils.java | 8 ++++---- .../examples/distribution/DistributionsApplication.java | 5 +++-- .../commons/statistics/examples/distribution/ExpCommand.java | 8 ++++---- .../apache/commons/statistics/examples/distribution/FCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/GammaCommand.java | 8 ++++---- .../statistics/examples/distribution/GeometricCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/GumbelCommand.java | 8 ++++---- .../statistics/examples/distribution/HypergeometricCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/LaplaceCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/LevyCommand.java | 8 ++++---- .../statistics/examples/distribution/LogNormalCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/LogisticCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/NakagamiCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/NormalCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/ParetoCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/PascalCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/PoissonCommand.java | 8 ++++---- .../apache/commons/statistics/examples/distribution/TCommand.java | 8 ++++---- .../statistics/examples/distribution/TriangularCommand.java | 8 ++++---- .../statistics/examples/distribution/TruncatedNormalCommand.java | 8 ++++---- .../examples/distribution/UniformContinuousCommand.java | 8 ++++---- .../statistics/examples/distribution/UniformDiscreteCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/WeibullCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/ZipfCommand.java | 8 ++++---- .../commons/statistics/examples/distribution/package-info.java | 3 ++- 31 files changed, 115 insertions(+), 113 deletions(-) diff --git a/commons-statistics-examples/examples-distribution/HOWTO.md b/commons-statistics-examples/examples-distribution/HOWTO.md index 4ed0b2c..6d3ddf0 100644 --- a/commons-statistics-examples/examples-distribution/HOWTO.md +++ b/commons-statistics-examples/examples-distribution/HOWTO.md @@ -39,7 +39,7 @@ named by the command. Each distribution command has the following functions: | pdf | Probability Density Function (continuous distributions) | | pmf | Probability Mass Function (discrete distributions) | | cdf | Cumulative Probability Density Function | -| survival | Survival Probability Function | +| sf | Survival Probability Function | | icdf | Inverse Cumulative Probability Density Function | | isf | Inverse Survival Probability Function | | lpdf | Natural logarithm of the PDF (continuous distributions) | diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/BetaCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/BetaCommand.java index 9ed24ac..df4a640 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/BetaCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/BetaCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; BetaCommand.PDF.class, BetaCommand.LPDF.class, BetaCommand.CDF.class, - BetaCommand.Survival.class, + BetaCommand.SF.class, BetaCommand.ICDF.class, BetaCommand.ISF.class, }) @@ -136,10 +136,10 @@ class BetaCommand extends AbstractDistributionCommand { description = "Beta distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Beta distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/BinomialCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/BinomialCommand.java index 296bb63..849ca79 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/BinomialCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/BinomialCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; BinomialCommand.PMF.class, BinomialCommand.LPMF.class, BinomialCommand.CDF.class, - BinomialCommand.Survival.class, + BinomialCommand.SF.class, BinomialCommand.ICDF.class, BinomialCommand.ISF.class, }) @@ -139,10 +139,10 @@ class BinomialCommand extends AbstractDistributionCommand { description = "Binomial distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Binomial distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/CauchyCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/CauchyCommand.java index d9637de..1439eb9 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/CauchyCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/CauchyCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; CauchyCommand.PDF.class, CauchyCommand.LPDF.class, CauchyCommand.CDF.class, - CauchyCommand.Survival.class, + CauchyCommand.SF.class, CauchyCommand.ICDF.class, CauchyCommand.ISF.class, }) @@ -136,10 +136,10 @@ class CauchyCommand extends AbstractDistributionCommand { description = "Cauchy distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Cauchy distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ChiSquaredCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ChiSquaredCommand.java index 8df0119..7902f32 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ChiSquaredCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ChiSquaredCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; ChiSquaredCommand.PDF.class, ChiSquaredCommand.LPDF.class, ChiSquaredCommand.CDF.class, - ChiSquaredCommand.Survival.class, + ChiSquaredCommand.SF.class, ChiSquaredCommand.ICDF.class, ChiSquaredCommand.ISF.class, }) @@ -123,10 +123,10 @@ class ChiSquaredCommand extends AbstractDistributionCommand { description = "Chi-squared distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Chi-squared distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionFunction.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionFunction.java index 8a98dae..6186e38 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionFunction.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionFunction.java @@ -33,7 +33,7 @@ enum DistributionFunction { /** Inverse Cumulative Probability Density Function. */ ICDF, /** Survival Probability Function. */ - Survival, + SF, /** Inverse Survival Probability Function. */ ISF } diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionUtils.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionUtils.java index 1a87dda..f6207e1 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionUtils.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionUtils.java @@ -228,7 +228,7 @@ final class DistributionUtils { if (!(upper == dd.inverseSurvivalProbability(0))) { out.printf("%s upper isf(0.0) : %s != %s", title, upper, dd.inverseSurvivalProbability(0)); } - // Validate CDF + Survival == 1 + // Validate CDF + SF == 1 for (final double x : points) { final double p1 = dd.cumulativeProbability(x); final double p2 = dd.survivalProbability(x); @@ -302,7 +302,7 @@ final class DistributionUtils { if (!(upper == dd.inverseSurvivalProbability(0))) { out.printf("%s upper isf(0.0) : %d != %d", title, upper, dd.inverseSurvivalProbability(0)); } - // Validate CDF + Survival == 1 + // Validate CDF + SF == 1 for (final int x : points) { final double p1 = dd.cumulativeProbability(x); final double p2 = dd.survivalProbability(x); @@ -413,7 +413,7 @@ final class DistributionUtils { case CDF: f = ContinuousDistribution::cumulativeProbability; break; - case Survival: + case SF: f = ContinuousDistribution::survivalProbability; break; default: @@ -453,7 +453,7 @@ final class DistributionUtils { case CDF: f = DiscreteDistribution::cumulativeProbability; break; - case Survival: + case SF: f = DiscreteDistribution::survivalProbability; break; default: diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionsApplication.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionsApplication.java index c5fac71..c1f003e 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionsApplication.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/DistributionsApplication.java @@ -21,7 +21,7 @@ import picocli.CommandLine.Command; /** * Construct instances of probability distributions using the Commons Statistics library. - * Output values from the distribution functions: PDF; CDF; Survival Function; and Inverse CDF. + * Output values from the distribution functions: PDF; CDF; SF Function; and Inverse CDF. */ public final class DistributionsApplication { @@ -33,8 +33,9 @@ public final class DistributionsApplication { // PDF(x) Probability Density Function (continuous distributions) // PMF(x) Probability Mass Function (discrete distributions) // CDF(x) Cumulative Probability Function - // Survival(x) Survival Probability Function + // SF(x) Survival Probability Function // InverseCDF(p) Inverse Cumulative Probability Function + // InverseSF(p) Inverse Survival Probability Function // // There is very little logic in the application. All the classes serve to provide // commands for annotation with the PicoCLI library. Each command must have an annotated diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ExpCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ExpCommand.java index ffd7b58..ef44072 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ExpCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ExpCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; ExpCommand.PDF.class, ExpCommand.LPDF.class, ExpCommand.CDF.class, - ExpCommand.Survival.class, + ExpCommand.SF.class, ExpCommand.ICDF.class, ExpCommand.ISF.class, }) @@ -122,10 +122,10 @@ class ExpCommand extends AbstractDistributionCommand { description = "Exponential distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Exponential distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/FCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/FCommand.java index 4299e4b..ee9aa81 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/FCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/FCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; FCommand.PDF.class, FCommand.LPDF.class, FCommand.CDF.class, - FCommand.Survival.class, + FCommand.SF.class, FCommand.ICDF.class, FCommand.ISF.class, }) @@ -136,10 +136,10 @@ class FCommand extends AbstractDistributionCommand { description = "F distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "F distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GammaCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GammaCommand.java index 3fdc22d..19366df 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GammaCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GammaCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; GammaCommand.PDF.class, GammaCommand.LPDF.class, GammaCommand.CDF.class, - GammaCommand.Survival.class, + GammaCommand.SF.class, GammaCommand.ICDF.class, GammaCommand.ISF.class, }) @@ -137,10 +137,10 @@ class GammaCommand extends AbstractDistributionCommand { description = "Gamma distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Gamma distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GeometricCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GeometricCommand.java index 34b4df3..186c943 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GeometricCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GeometricCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; GeometricCommand.PMF.class, GeometricCommand.LPMF.class, GeometricCommand.CDF.class, - GeometricCommand.Survival.class, + GeometricCommand.SF.class, GeometricCommand.ICDF.class, GeometricCommand.ISF.class, }) @@ -125,10 +125,10 @@ class GeometricCommand extends AbstractDistributionCommand { description = "Geometric distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Geometric distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GumbelCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GumbelCommand.java index 9179dcb..b3772b4 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GumbelCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/GumbelCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; GumbelCommand.PDF.class, GumbelCommand.LPDF.class, GumbelCommand.CDF.class, - GumbelCommand.Survival.class, + GumbelCommand.SF.class, GumbelCommand.ICDF.class, GumbelCommand.ISF.class, }) @@ -136,10 +136,10 @@ class GumbelCommand extends AbstractDistributionCommand { description = "Gumbel distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Gumbel distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/HypergeometricCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/HypergeometricCommand.java index d6573cc..1fde7be 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/HypergeometricCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/HypergeometricCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; HypergeometricCommand.PMF.class, HypergeometricCommand.LPMF.class, HypergeometricCommand.CDF.class, - HypergeometricCommand.Survival.class, + HypergeometricCommand.SF.class, HypergeometricCommand.ICDF.class, HypergeometricCommand.ISF.class, }) @@ -150,10 +150,10 @@ class HypergeometricCommand extends AbstractDistributionCommand { description = "Hypergeometric distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Hypergeometric distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LaplaceCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LaplaceCommand.java index b9aa4f5..3ea86a8 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LaplaceCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LaplaceCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; LaplaceCommand.PDF.class, LaplaceCommand.LPDF.class, LaplaceCommand.CDF.class, - LaplaceCommand.Survival.class, + LaplaceCommand.SF.class, LaplaceCommand.ICDF.class, LaplaceCommand.ISF.class, }) @@ -136,10 +136,10 @@ class LaplaceCommand extends AbstractDistributionCommand { description = "Laplace distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Laplace distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LevyCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LevyCommand.java index 0b9b831..290c17c 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LevyCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LevyCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; LevyCommand.PDF.class, LevyCommand.LPDF.class, LevyCommand.CDF.class, - LevyCommand.Survival.class, + LevyCommand.SF.class, LevyCommand.ICDF.class, LevyCommand.ISF.class, }) @@ -136,10 +136,10 @@ class LevyCommand extends AbstractDistributionCommand { description = "Levy distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Levy distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LogNormalCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LogNormalCommand.java index 4d6c786..b2ef497 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LogNormalCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LogNormalCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; LogNormalCommand.PDF.class, LogNormalCommand.LPDF.class, LogNormalCommand.CDF.class, - LogNormalCommand.Survival.class, + LogNormalCommand.SF.class, LogNormalCommand.ICDF.class, LogNormalCommand.ISF.class, }) @@ -137,10 +137,10 @@ class LogNormalCommand extends AbstractDistributionCommand { description = "Log-normal distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Log-normal distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LogisticCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LogisticCommand.java index 0c14a2f..03092b7 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LogisticCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/LogisticCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; LogisticCommand.PDF.class, LogisticCommand.LPDF.class, LogisticCommand.CDF.class, - LogisticCommand.Survival.class, + LogisticCommand.SF.class, LogisticCommand.ICDF.class, LogisticCommand.ISF.class, }) @@ -136,10 +136,10 @@ class LogisticCommand extends AbstractDistributionCommand { description = "Logistic distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Logistic distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/NakagamiCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/NakagamiCommand.java index a447b16..744e8e4 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/NakagamiCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/NakagamiCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; NakagamiCommand.PDF.class, NakagamiCommand.LPDF.class, NakagamiCommand.CDF.class, - NakagamiCommand.Survival.class, + NakagamiCommand.SF.class, NakagamiCommand.ICDF.class, NakagamiCommand.ISF.class, }) @@ -136,10 +136,10 @@ class NakagamiCommand extends AbstractDistributionCommand { description = "Nakagami distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Nakagami distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/NormalCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/NormalCommand.java index ad39a9a..11a89b9 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/NormalCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/NormalCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; NormalCommand.PDF.class, NormalCommand.LPDF.class, NormalCommand.CDF.class, - NormalCommand.Survival.class, + NormalCommand.SF.class, NormalCommand.ICDF.class, NormalCommand.ISF.class, }) @@ -138,10 +138,10 @@ class NormalCommand extends AbstractDistributionCommand { description = "Normal distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Normal distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ParetoCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ParetoCommand.java index 8bd305a..4c999d0 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ParetoCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ParetoCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; ParetoCommand.PDF.class, ParetoCommand.LPDF.class, ParetoCommand.CDF.class, - ParetoCommand.Survival.class, + ParetoCommand.SF.class, ParetoCommand.ICDF.class, ParetoCommand.ISF.class, }) @@ -137,10 +137,10 @@ class ParetoCommand extends AbstractDistributionCommand { description = "Pareto distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Pareto distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/PascalCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/PascalCommand.java index 888b2d9..2f9c4aa 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/PascalCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/PascalCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; PascalCommand.PMF.class, PascalCommand.LPMF.class, PascalCommand.CDF.class, - PascalCommand.Survival.class, + PascalCommand.SF.class, PascalCommand.ICDF.class, PascalCommand.ISF.class, }) @@ -142,10 +142,10 @@ class PascalCommand extends AbstractDistributionCommand { description = "Pascal distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Pascal distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/PoissonCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/PoissonCommand.java index b02b903..a3a5adf 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/PoissonCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/PoissonCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; PoissonCommand.PMF.class, PoissonCommand.LPMF.class, PoissonCommand.CDF.class, - PoissonCommand.Survival.class, + PoissonCommand.SF.class, PoissonCommand.ICDF.class, PoissonCommand.ISF.class, }) @@ -125,10 +125,10 @@ class PoissonCommand extends AbstractDistributionCommand { description = "Poisson distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Poisson distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TCommand.java index 3412501..d7f6e2e 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; TCommand.PDF.class, TCommand.LPDF.class, TCommand.CDF.class, - TCommand.Survival.class, + TCommand.SF.class, TCommand.ICDF.class, TCommand.ISF.class, }) @@ -122,10 +122,10 @@ class TCommand extends AbstractDistributionCommand { description = "T distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "T distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TriangularCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TriangularCommand.java index 49b4ee8..65f915d 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TriangularCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TriangularCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; TriangularCommand.PDF.class, TriangularCommand.LPDF.class, TriangularCommand.CDF.class, - TriangularCommand.Survival.class, + TriangularCommand.SF.class, TriangularCommand.ICDF.class, TriangularCommand.ISF.class, }) @@ -149,10 +149,10 @@ class TriangularCommand extends AbstractDistributionCommand { description = "Triangular distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Triangular distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TruncatedNormalCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TruncatedNormalCommand.java index 3cf0e61..f823ec1 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TruncatedNormalCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/TruncatedNormalCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; TruncatedNormalCommand.PDF.class, TruncatedNormalCommand.LPDF.class, TruncatedNormalCommand.CDF.class, - TruncatedNormalCommand.Survival.class, + TruncatedNormalCommand.SF.class, TruncatedNormalCommand.ICDF.class, TruncatedNormalCommand.ISF.class, }) @@ -161,10 +161,10 @@ class TruncatedNormalCommand extends AbstractDistributionCommand { description = "Truncated normal distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Truncated normal distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/UniformContinuousCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/UniformContinuousCommand.java index ac4852d..cf238f5 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/UniformContinuousCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/UniformContinuousCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; UniformContinuousCommand.PDF.class, UniformContinuousCommand.LPDF.class, UniformContinuousCommand.CDF.class, - UniformContinuousCommand.Survival.class, + UniformContinuousCommand.SF.class, UniformContinuousCommand.ICDF.class, UniformContinuousCommand.ISF.class, }) @@ -139,10 +139,10 @@ class UniformContinuousCommand extends AbstractDistributionCommand { description = "Continuous uniform distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Continuous uniform distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/UniformDiscreteCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/UniformDiscreteCommand.java index a16427c..e41e3d5 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/UniformDiscreteCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/UniformDiscreteCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; UniformDiscreteCommand.PMF.class, UniformDiscreteCommand.LPMF.class, UniformDiscreteCommand.CDF.class, - UniformDiscreteCommand.Survival.class, + UniformDiscreteCommand.SF.class, UniformDiscreteCommand.ICDF.class, UniformDiscreteCommand.ISF.class, }) @@ -140,10 +140,10 @@ class UniformDiscreteCommand extends AbstractDistributionCommand { description = "Discrete uniform distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Discrete uniform distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/WeibullCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/WeibullCommand.java index bcbdaac..0a05a2a 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/WeibullCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/WeibullCommand.java @@ -35,7 +35,7 @@ import picocli.CommandLine.Option; WeibullCommand.PDF.class, WeibullCommand.LPDF.class, WeibullCommand.CDF.class, - WeibullCommand.Survival.class, + WeibullCommand.SF.class, WeibullCommand.ICDF.class, WeibullCommand.ISF.class, }) @@ -137,10 +137,10 @@ class WeibullCommand extends AbstractDistributionCommand { description = "Weibull distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Weibull distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ZipfCommand.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ZipfCommand.java index 97e88cd..c1b3861 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ZipfCommand.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/ZipfCommand.java @@ -34,7 +34,7 @@ import picocli.CommandLine.Option; ZipfCommand.PMF.class, ZipfCommand.LPMF.class, ZipfCommand.CDF.class, - ZipfCommand.Survival.class, + ZipfCommand.SF.class, ZipfCommand.ICDF.class, ZipfCommand.ISF.class, }) @@ -138,10 +138,10 @@ class ZipfCommand extends AbstractDistributionCommand { description = "Zipf distribution CDF.") static class CDF extends ProbabilityCommand {} - /** Survival command. */ - @Command(name = "survival", aliases = {"sur"}, + /** SF command. */ + @Command(name = "sf", description = "Zipf distribution survival probability.") - static class Survival extends ProbabilityCommand {} + static class SF extends ProbabilityCommand {} /** ICDF command. */ @Command(name = "icdf", diff --git a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/package-info.java b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/package-info.java index 48a45e6..8df3c91 100644 --- a/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/package-info.java +++ b/commons-statistics-examples/examples-distribution/src/main/java/org/apache/commons/statistics/examples/distribution/package-info.java @@ -20,7 +20,8 @@ * * <p> * This package contains an application for computing functions of probability distributions. - * The following functions can be evaluated: PDF, CDF, Survival function, and Inverse CDF. + * The following functions can be evaluated: PDF, CDF, Survival function, Inverse CDF and + * Inverse survival function. * </p> */
