Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 18661 invoked from network); 10 Sep 2007 07:39:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Sep 2007 07:39:18 -0000 Received: (qmail 21468 invoked by uid 500); 10 Sep 2007 07:39:11 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 21395 invoked by uid 500); 10 Sep 2007 07:39:11 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 21386 invoked by uid 99); 10 Sep 2007 07:39:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2007 00:39:11 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2007 07:39:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AFA731A9832; Mon, 10 Sep 2007 00:38:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r574159 - /commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/DirectSearchOptimizer.java Date: Mon, 10 Sep 2007 07:38:56 -0000 To: commits@commons.apache.org From: luc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070910073856.AFA731A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: luc Date: Mon Sep 10 00:38:55 2007 New Revision: 574159 URL: http://svn.apache.org/viewvc?rev=574159&view=rev Log: fixed javadoc Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/DirectSearchOptimizer.java Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/DirectSearchOptimizer.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/DirectSearchOptimizer.java?rev=574159&r1=574158&r2=574159&view=diff ============================================================================== --- commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/DirectSearchOptimizer.java (original) +++ commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/DirectSearchOptimizer.java Mon Sep 10 00:38:55 2007 @@ -53,13 +53,12 @@ * set of n+1 points in dimension n) that is updated by the algorithms * steps.

- *

The instances can be built either in single-start or in + *

Minimization can be attempted either in single-start or in * multi-start mode. Multi-start is a traditional way to try to avoid - * beeing trapped in a local minimum and miss the global minimum of a + * being trapped in a local minimum and miss the global minimum of a * function. It can also be used to verify the convergence of an - * algorithm. In multi-start mode, the {@link #minimizes(CostFunction, - * int, ConvergenceChecker, double[], double[]) minimizes} - * method returns the best minimum found after all starts, and the + * algorithm. The various multi-start-enabled minimizes + * methods return the best minimum found after all starts, and the * {@link #getMinima getMinima} method can be used to retrieve all * minima from all starts (including the one already provided by the * {@link #minimizes(CostFunction, int, ConvergenceChecker, double[], @@ -87,7 +86,7 @@ * considered to represent two opposite vertices of a box parallel * to the canonical axes of the space. The simplex is the subset of * vertices encountered while going from vertexA to vertexB - * travelling along the box edges only. This can be seen as a scaled + * traveling along the box edges only. This can be seen as a scaled * regular simplex using the projected separation between the given * points as the scaling factor along each coordinate axis.

*

The optimization is performed in single-start mode.

@@ -125,7 +124,7 @@ * considered to represent two opposite vertices of a box parallel * to the canonical axes of the space. The simplex is the subset of * vertices encountered while going from vertexA to vertexB - * travelling along the box edges only. This can be seen as a scaled + * traveling along the box edges only. This can be seen as a scaled * regular simplex using the projected separation between the given * points as the scaling factor along each coordinate axis.

*

The optimization is performed in multi-start mode.

@@ -154,12 +153,12 @@ int starts, long seed) throws CostException, ConvergenceException { - // set up the simplex travelling around the box + // set up the simplex traveling around the box buildSimplex(vertexA, vertexB); // we consider the simplex could have been produced by a generator // having its mean value at the center of the box, the standard - // deviation along each axe beeing the corresponding half size + // deviation along each axe being the corresponding half size double[] mean = new double[vertexA.length]; double[] standardDeviation = new double[vertexA.length]; for (int i = 0; i < vertexA.length; ++i) { @@ -343,7 +342,7 @@ *

The two vertices are considered to represent two opposite * vertices of a box parallel to the canonical axes of the * space. The simplex is the subset of vertices encountered while - * going from vertexA to vertexB travelling along the box edges + * going from vertexA to vertexB traveling along the box edges * only. This can be seen as a scaled regular simplex using the * projected separation between the given points as the scaling * factor along each coordinate axis.

@@ -355,7 +354,7 @@ int n = vertexA.length; simplex = new PointCostPair[n + 1]; - // set up the simplex travelling around the box + // set up the simplex traveling around the box for (int i = 0; i <= n; ++i) { double[] vertex = new double[n]; if (i > 0) { @@ -441,7 +440,7 @@ * highest minimum cost, and null elements corresponding to the runs * that did not converge (all elements will be null if the {@link * #minimizes(CostFunction, int, ConvergenceChecker, double[], double[]) - * minimizes} method throwed a {@link ConvergenceException + * minimizes} method did throw a {@link ConvergenceException * ConvergenceException}).

* @return array containing the minima, or null if {@link * #minimizes(CostFunction, int, ConvergenceChecker, double[], double[])