From: <kin...@us...> - 2009-12-06 04:31:29
|
Revision: 4444 http://teem.svn.sourceforge.net/teem/?rev=4444&view=rev Author: kindlmann Date: 2009-12-06 04:31:23 +0000 (Sun, 06 Dec 2009) Log Message: ----------- renaming StepScale to EnergyStepScale Modified Paths: -------------- teem/trunk/src/pull/actionPull.c teem/trunk/src/pull/constraints.c teem/trunk/src/pull/parmPull.c teem/trunk/src/pull/pull.h Modified: teem/trunk/src/pull/actionPull.c =================================================================== --- teem/trunk/src/pull/actionPull.c 2009-12-02 01:44:57 UTC (rev 4443) +++ teem/trunk/src/pull/actionPull.c 2009-12-06 04:31:23 UTC (rev 4444) @@ -802,7 +802,7 @@ */ stepBad = (constrFail || energyIncr); if (stepBad) { - point->stepEnergy *= task->pctx->sysParm.stepScale; + point->stepEnergy *= task->pctx->sysParm.energyStepScale; if (constrFail) { _pullPointHistAdd(point, pullCondConstraintFail); } else { @@ -937,6 +937,7 @@ for (myPointIdx=0; myPointIdx<myBin->pointNum; myPointIdx++) { pullPoint *point; if (task->pctx->pointNum > _PULL_PROGRESS_POINT_NUM_MIN + && !task->pctx->flag.binSingle && 0 == myBinIdx % task->pctx->progressBinMod) { printf("."); fflush(stdout); } Modified: teem/trunk/src/pull/constraints.c =================================================================== --- teem/trunk/src/pull/constraints.c 2009-12-02 01:44:57 UTC (rev 4443) +++ teem/trunk/src/pull/constraints.c 2009-12-06 04:31:23 UTC (rev 4444) @@ -115,7 +115,7 @@ SAVE(state, aval, val, grad, point->pos); hack = 1; } else { /* oops, try again, don't update dir or len, reset val */ - hack *= task->pctx->sysParm.stepScale; + hack *= task->pctx->sysParm.energyStepScale; RESTORE(aval, val, grad, point->pos, state); } } @@ -433,7 +433,7 @@ SAVE(state, val, grad, hess, proj, point->pos); hack = 1; } else { /* oops, try again */ - hack *= task->pctx->sysParm.stepScale; + hack *= task->pctx->sysParm.energyStepScale; RESTORE(val, grad, hess, proj, point->pos, state); } } Modified: teem/trunk/src/pull/parmPull.c =================================================================== --- teem/trunk/src/pull/parmPull.c 2009-12-02 01:44:57 UTC (rev 4443) +++ teem/trunk/src/pull/parmPull.c 2009-12-06 04:31:23 UTC (rev 4444) @@ -50,7 +50,7 @@ sysParm->probeProb = 1.0; sysParm->stepInitial = 1; sysParm->opporStepScale = 1.0; - sysParm->stepScale = 0.5; + sysParm->energyStepScale = 0.5; sysParm->constraintStepMin = 0.0001; sysParm->energyDecreaseMin = 0.001; sysParm->energyDecreasePopCntlMin = 0.02; @@ -146,8 +146,8 @@ sysParm->stepInitial); return 1; } - CHECK(opporStepScale, 1.0, 10.0); - CHECK(stepScale, 0.01, 0.99); + CHECK(opporStepScale, 1.0, 5.0); + CHECK(energyStepScale, 0.01, 0.99); CHECK(constraintStepMin, 0.00000000000000001, 0.1); CHECK(energyDecreaseMin, -0.2, 1.0); CHECK(energyDecreasePopCntlMin, -1.0, 1.0); @@ -196,8 +196,8 @@ case pullSysParmOpporStepScale: pctx->sysParm.opporStepScale = pval; break; - case pullSysParmStepScale: - pctx->sysParm.stepScale = pval; + case pullSysParmEnergyStepScale: + pctx->sysParm.energyStepScale = pval; break; case pullSysParmEnergyDecreasePopCntlMin: pctx->sysParm.energyDecreasePopCntlMin = pval; Modified: teem/trunk/src/pull/pull.h =================================================================== --- teem/trunk/src/pull/pull.h 2009-12-02 01:44:57 UTC (rev 4443) +++ teem/trunk/src/pull/pull.h 2009-12-06 04:31:23 UTC (rev 4444) @@ -525,7 +525,7 @@ /* (< 1.0) when energy goes up instead of down, or when constraint satisfaction seems to be going the wrong way, how to scale (down) step size */ - pullSysParmStepScale, + pullSysParmEnergyStepScale, /* pseudo-convergence threshold that controls when population control is activated (has to be higher than (less strict) energyDecreaseMin */ @@ -553,7 +553,7 @@ double alpha, beta, gamma, wall, radiusSpace, radiusScale, neighborTrueProb, probeProb, - stepInitial, opporStepScale, stepScale, constraintStepMin, + stepInitial, opporStepScale, energyStepScale, constraintStepMin, energyDecreaseMin, energyDecreasePopCntlMin, energyIncreasePermit; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |