Changed/added "toString" methods.
Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/2efe2bc1 Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/2efe2bc1 Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/2efe2bc1 Branch: refs/heads/master Commit: 2efe2bc1510b77731ecb463d0d5617059fbca0ff Parents: af3e15d Author: Gilles <[email protected]> Authored: Fri Nov 18 01:30:26 2016 +0100 Committer: Gilles <[email protected]> Committed: Fri Nov 18 01:30:26 2016 +0100 ---------------------------------------------------------------------- .../sampling/distribution/AhrensDieterExponentialSampler.java | 2 +- .../distribution/AhrensDieterMarsagliaTsangGammaSampler.java | 2 +- .../rng/sampling/distribution/BoxMullerGaussianSampler.java | 2 +- .../rng/sampling/distribution/BoxMullerLogNormalSampler.java | 2 +- .../commons/rng/sampling/distribution/ChengBetaSampler.java | 2 +- .../rng/sampling/distribution/ContinuousUniformSampler.java | 2 +- .../rng/sampling/distribution/DiscreteUniformSampler.java | 2 +- .../distribution/InverseTransformContinuousSampler.java | 2 +- .../sampling/distribution/InverseTransformDiscreteSampler.java | 4 ++-- .../commons/rng/sampling/distribution/PoissonSampler.java | 6 ++++++ .../sampling/distribution/RejectionInversionZipfSampler.java | 6 ++++++ .../apache/commons/rng/sampling/distribution/SamplerBase.java | 2 +- 12 files changed, 23 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterExponentialSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterExponentialSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterExponentialSampler.java index 41682ea..4361dad 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterExponentialSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterExponentialSampler.java @@ -113,6 +113,6 @@ public class AhrensDieterExponentialSampler /** {@inheritDoc} */ @Override public String toString() { - return "[Ahrens-Dieter method for exponential distribution " + super.toString() + "]"; + return "Ahrens-Dieter Exponential deviate [" + super.toString() + "]"; } } http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java index 90fefc7..a9b8034 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java @@ -135,6 +135,6 @@ public class AhrensDieterMarsagliaTsangGammaSampler /** {@inheritDoc} */ @Override public String toString() { - return "[Ahrens-Dieter-Marsaglia-Tsang method for Gamma distribution " + super.toString() + "]"; + return "Ahrens-Dieter-Marsaglia-Tsang Gamma deviate [" + super.toString() + "]"; } } http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerGaussianSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerGaussianSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerGaussianSampler.java index 527db1e..a2b4f00 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerGaussianSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerGaussianSampler.java @@ -77,6 +77,6 @@ public class BoxMullerGaussianSampler /** {@inheritDoc} */ @Override public String toString() { - return "[Box-Muller method for Gaussian distribution " + super.toString() + "]"; + return "Box-Muller Gaussian deviate [" + super.toString() + "]"; } } http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerLogNormalSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerLogNormalSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerLogNormalSampler.java index 63e9280..f43a9e5 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerLogNormalSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/BoxMullerLogNormalSampler.java @@ -55,6 +55,6 @@ public class BoxMullerLogNormalSampler /** {@inheritDoc} */ @Override public String toString() { - return "[Box-Muller method for Log normal distribution " + gaussian.toString() + "]"; + return "Box-Muller Log Normal [" + gaussian.toString() + "]"; } } http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ChengBetaSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ChengBetaSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ChengBetaSampler.java index 5335947..1b4249a 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ChengBetaSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ChengBetaSampler.java @@ -70,7 +70,7 @@ public class ChengBetaSampler /** {@inheritDoc} */ @Override public String toString() { - return "[Cheng method for Beta distribution " + super.toString() + "]"; + return "Cheng Beta deviate [" + super.toString() + "]"; } /** http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ContinuousUniformSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ContinuousUniformSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ContinuousUniformSampler.java index 86d0ea4..4b59e99 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ContinuousUniformSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/ContinuousUniformSampler.java @@ -52,6 +52,6 @@ public class ContinuousUniformSampler /** {@inheritDoc} */ @Override public String toString() { - return "[Uniform distribution " + super.toString() + "]"; + return "Uniform deviate [" + super.toString() + "]"; } } http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/DiscreteUniformSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/DiscreteUniformSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/DiscreteUniformSampler.java index c620eea..5ee69be 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/DiscreteUniformSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/DiscreteUniformSampler.java @@ -72,6 +72,6 @@ public class DiscreteUniformSampler /** {@inheritDoc} */ @Override public String toString() { - return "[Uniform distribution " + super.toString() + "]"; + return "Uniform deviate [" + super.toString() + "]"; } } http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformContinuousSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformContinuousSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformContinuousSampler.java index d79665b..d2e628c 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformContinuousSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformContinuousSampler.java @@ -79,6 +79,6 @@ public class InverseTransformContinuousSampler /** {@inheritDoc} */ @Override public String toString() { - return "[Inverse method " + super.toString() + "]"; + return function.toString() + " (inverse method) [" + super.toString() + "]"; } } http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformDiscreteSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformDiscreteSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformDiscreteSampler.java index ed0cfd9..11be564 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformDiscreteSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/InverseTransformDiscreteSampler.java @@ -65,7 +65,7 @@ public class InverseTransformDiscreteSampler * @param function Inverse cumulative probability function. */ public InverseTransformDiscreteSampler(UniformRandomProvider rng, - DiscreteInverseCumulativeProbabilityFunction function) { + DiscreteInverseCumulativeProbabilityFunction function) { super(rng); this.function = function; } @@ -79,6 +79,6 @@ public class InverseTransformDiscreteSampler /** {@inheritDoc} */ @Override public String toString() { - return "[Inverse method " + super.toString() + "]"; + return function.toString() + " (inverse method) [" + super.toString() + "]"; } } http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/PoissonSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/PoissonSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/PoissonSampler.java index 94b19d9..7d7d896 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/PoissonSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/PoissonSampler.java @@ -75,6 +75,12 @@ public class PoissonSampler return (int) Math.min(nextPoisson(mean), Integer.MAX_VALUE); } + /** {@inheritDoc} */ + @Override + public String toString() { + return "Poisson deviate [" + super.toString() + "]"; + } + /** * @param meanPoisson Mean. * @return the next sample. http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/RejectionInversionZipfSampler.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/RejectionInversionZipfSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/RejectionInversionZipfSampler.java index a5bd8c6..26e1c64 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/RejectionInversionZipfSampler.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/RejectionInversionZipfSampler.java @@ -159,6 +159,12 @@ public class RejectionInversionZipfSampler } } + /** {@inheritDoc} */ + @Override + public String toString() { + return "Rejection inversion Zipf deviate [" + super.toString() + "]"; + } + /** * {@code H(x)} is defined as * <ul> http://git-wip-us.apache.org/repos/asf/commons-rng/blob/2efe2bc1/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/SamplerBase.java ---------------------------------------------------------------------- diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/SamplerBase.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/SamplerBase.java index d345146..5972e71 100644 --- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/SamplerBase.java +++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/SamplerBase.java @@ -58,6 +58,6 @@ public class SamplerBase { /** {@inheritDoc} */ @Override public String toString() { - return "[" + rng.toString() + "]"; + return "rng=" + rng.toString(); } }
