Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C28319B48 for ; Wed, 2 Nov 2011 12:08:15 +0000 (UTC) Received: (qmail 12950 invoked by uid 500); 2 Nov 2011 12:08:15 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 12887 invoked by uid 500); 2 Nov 2011 12:08:15 -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 12880 invoked by uid 99); 2 Nov 2011 12:08:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2011 12:08:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2011 12:08:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C90F8238890A for ; Wed, 2 Nov 2011 12:07:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1196553 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java Date: Wed, 02 Nov 2011 12:07:53 -0000 To: commits@commons.apache.org From: erans@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111102120753.C90F8238890A@eris.apache.org> Author: erans Date: Wed Nov 2 12:07:53 2011 New Revision: 1196553 URL: http://svn.apache.org/viewvc?rev=1196553&view=rev Log: Naming of variable. Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java?rev=1196553&r1=1196552&r2=1196553&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java Wed Nov 2 12:07:53 2011 @@ -83,7 +83,7 @@ public class CMAESOptimizer implements MultivariateRealOptimizer { /** Default value for {@link #checkFeasableCount}: {@value}. */ public static final int DEFAULT_CHECKFEASABLECOUNT = 0; - /** Default value for {@link #stopfitness}: {@value}. */ + /** Default value for {@link #stopFitness}: {@value}. */ public static final double DEFAULT_STOPFITNESS = 0; /** Default value for {@link #isActiveCMA}: {@value}. */ public static final boolean DEFAULT_ISACTIVECMA = true; @@ -148,7 +148,7 @@ public class CMAESOptimizer /** Maximal number of iterations allowed. */ private int maxIterations; /** Limit for fitness value. */ - private double stopfitness; + private double stopFitness; /** Stop if x-changes larger stopTolUpX. */ private double stopTolUpX; /** Stop if x-change smaller stopTolX. */ @@ -289,7 +289,7 @@ public class CMAESOptimizer } } this.maxIterations = maxIterations; - this.stopfitness = stopFitness; + this.stopFitness = stopFitness; this.isActiveCMA = isActiveCMA; this.diagonalOnly = diagonalOnly; this.checkFeasableCount = checkFeasableCount; @@ -407,8 +407,8 @@ public class CMAESOptimizer } // handle termination criteria // Break, if fitness is good enough - if (stopfitness != 0) { // only if stopfitness is defined - if (bestFitness < (isMinimize ? stopfitness : -stopfitness)) { + if (stopFitness != 0) { // only if stopFitness is defined + if (bestFitness < (isMinimize ? stopFitness : -stopFitness)) { break generationLoop; } }