diff --git a/src/java/org/apache/commons/math/ConvergenceException.java b/src/java/org/apache/commons/math/ConvergenceException.java index 320fdd018..3a0c4cd8f 100644 --- a/src/java/org/apache/commons/math/ConvergenceException.java +++ b/src/java/org/apache/commons/math/ConvergenceException.java @@ -16,18 +16,16 @@ */ package org.apache.commons.math; -import java.io.Serializable; - /** * Error thrown when a numerical computation can not be performed because the * numerical result failed to converge to a finite value. * * @version $Revision$ $Date$ */ -public class ConvergenceException extends MathException implements Serializable{ +public class ConvergenceException extends MathException { /** Serializable version identifier */ - private static final long serialVersionUID = 7426445244781020663L; + private static final long serialVersionUID = 4380655778005469702L; /** * Default constructor. @@ -36,15 +34,6 @@ public class ConvergenceException extends MathException implements Serializable{ super("Convergence failed", new Object[0]); } - /** - * Construct an exception with the given message. - * @param message descriptive error message - * @deprecated as of 1.2, replaced by {@link #ConvergenceException(String, Object[])} - */ - public ConvergenceException(String message) { - super(message); - } - /** * Constructs an exception with specified formatted detail message. * Message formatting is delegated to {@link java.text.MessageFormat}. @@ -55,16 +44,6 @@ public class ConvergenceException extends MathException implements Serializable{ super(pattern, arguments); } - /** - * Construct an exception with the given message and root cause. - * @param message descriptive error message - * @param cause the exception or error that caused this exception to be thrown - * @deprecated as of 1.2, replaced by {@link #ConvergenceException(String, Object[], Throwable)} - */ - public ConvergenceException(String message, Throwable cause) { - super(message, cause); - } - /** * Create an exception with a given root cause. * @param cause the exception or error that caused this exception to be thrown diff --git a/src/java/org/apache/commons/math/FunctionEvaluationException.java b/src/java/org/apache/commons/math/FunctionEvaluationException.java index 460a77d27..d87d33ece 100644 --- a/src/java/org/apache/commons/math/FunctionEvaluationException.java +++ b/src/java/org/apache/commons/math/FunctionEvaluationException.java @@ -84,6 +84,17 @@ public class FunctionEvaluationException extends MathException { this.argument = argument; } + /** + * Constructs an exception with specified root cause. + * Message formatting is delegated to {@link java.text.MessageFormat}. + * @param argument the failing function argument + * @param cause the exception or error that caused this exception to be thrown + */ + public FunctionEvaluationException(double argument, Throwable cause) { + super(cause); + this.argument = argument; + } + /** * Constructs an exception with specified formatted detail message and root cause. * Message formatting is delegated to {@link java.text.MessageFormat}. diff --git a/src/java/org/apache/commons/math/MessagesResources_fr.java b/src/java/org/apache/commons/math/MessagesResources_fr.java index 27f72846a..b040f6481 100644 --- a/src/java/org/apache/commons/math/MessagesResources_fr.java +++ b/src/java/org/apache/commons/math/MessagesResources_fr.java @@ -56,6 +56,14 @@ public class MessagesResources_fr { "Maximal number of iterations ({0}) exceeded", "Nombre maximal d''it\u00e9rations ({0}) d\u00e9pass\u00e9" }, + // org.apache.commons.math.DimensionMismatchException + { "dimension mismatch {0} != {1}", + "dimensions incompatibles {0} != {1}" }, + + // org.apache.commons.math.random.NotPositiveDefiniteMatrixException + { "not positive definite matrix", + "matrice non d\u00e9finie positive" }, + // org.apache.commons.math.fraction.FractionConversionException { "Unable to convert {0} to fraction after {1} iterations", "Impossible de convertir {0} en fraction apr\u00e8s {1} it\u00e9rations" },