From 248bfdfa0f9e380098c111dff5e98e73b1521233 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 14 Dec 2011 16:02:48 +0100 Subject: dos2unix --- .../src/locale/NLPSolverCommon_en_US.properties | 46 ++++++++--------- .../locale/NLPSolverStatusDialog_en_US.properties | 60 +++++++++++----------- 2 files changed, 53 insertions(+), 53 deletions(-) (limited to 'nlpsolver/src') diff --git a/nlpsolver/src/locale/NLPSolverCommon_en_US.properties b/nlpsolver/src/locale/NLPSolverCommon_en_US.properties index 0a84019d89a7..3f8baf0d43d7 100644 --- a/nlpsolver/src/locale/NLPSolverCommon_en_US.properties +++ b/nlpsolver/src/locale/NLPSolverCommon_en_US.properties @@ -1,23 +1,23 @@ -#BaseNLPSolver -NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables - -#BaseEvolutionarySolver -NLPSolverCommon.Properties.SwarmSize=Size of Swarm -NLPSolverCommon.Properties.LibrarySize=Size of Library -NLPSolverCommon.Properties.LearningCycles=Learning Cycles -NLPSolverCommon.Properties.GuessVariableRange=Variable Bounds Guessing -NLPSolverCommon.Properties.VariableRangeThreshold=Variable Bounds Threshold (when guessing) -NLPSolverCommon.Properties.UseACRComparator=Use ACR Comparator (instead of BCH) -NLPSolverCommon.Properties.UseRandomStartingPoint=Use Random starting point -NLPSolverCommon.Properties.StagnationLimit=Stagnation Limit -NLPSolverCommon.Properties.Tolerance=Stagnation Tolerance -NLPSolverCommon.Properties.EnhancedSolverStatus=Show enhanced solver status - -#DEPS -NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE Probability) -NLPSolverCommon.Properties.DEFactor=DE: Scaling Factor (0-1.2) -NLPSolverCommon.Properties.DECR=DE: Crossover Probability (0-1) -NLPSolverCommon.Properties.PSC1=PS: Cognitive Constant -NLPSolverCommon.Properties.PSC2=PS: Social Constant -NLPSolverCommon.Properties.PSWeight=PS: Constriction Coefficient -NLPSolverCommon.Properties.PSCL=PS: Mutation Probability (0-0.005) +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables + +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Size of Swarm +NLPSolverCommon.Properties.LibrarySize=Size of Library +NLPSolverCommon.Properties.LearningCycles=Learning Cycles +NLPSolverCommon.Properties.GuessVariableRange=Variable Bounds Guessing +NLPSolverCommon.Properties.VariableRangeThreshold=Variable Bounds Threshold (when guessing) +NLPSolverCommon.Properties.UseACRComparator=Use ACR Comparator (instead of BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Use Random starting point +NLPSolverCommon.Properties.StagnationLimit=Stagnation Limit +NLPSolverCommon.Properties.Tolerance=Stagnation Tolerance +NLPSolverCommon.Properties.EnhancedSolverStatus=Show enhanced solver status + +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE Probability) +NLPSolverCommon.Properties.DEFactor=DE: Scaling Factor (0-1.2) +NLPSolverCommon.Properties.DECR=DE: Crossover Probability (0-1) +NLPSolverCommon.Properties.PSC1=PS: Cognitive Constant +NLPSolverCommon.Properties.PSC2=PS: Social Constant +NLPSolverCommon.Properties.PSWeight=PS: Constriction Coefficient +NLPSolverCommon.Properties.PSCL=PS: Mutation Probability (0-0.005) diff --git a/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties b/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties index 19cb9de78c51..241259257ab2 100644 --- a/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties +++ b/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties @@ -1,30 +1,30 @@ -#Dialog -NLPSolverStatusDialog.Dialog.Caption=Solver Status - -#Controls -NLPSolverStatusDialog.Controls.lblSolution=Current Solution: -NLPSolverStatusDialog.Controls.lblIteration=Iteration: -NLPSolverStatusDialog.Controls.lblStagnation=Stagnation: -NLPSolverStatusDialog.Controls.lblRuntime=Runtime: -NLPSolverStatusDialog.Controls.btnStop=Stop -NLPSolverStatusDialog.Controls.btnOK=OK -NLPSolverStatusDialog.Controls.btnContinue=Continue - -#Messages -NLPSolverStatusDialog.Message.StopIteration=Maximum iterations reached. -NLPSolverStatusDialog.Message.StopStagnation=Process stopped due to stagnation. -NLPSolverStatusDialog.Message.StopUser=Process stopped due to user interruption. -NLPSolverStatusDialog.Message.CurrentIteration=Process stopped at iteration %d of %d. - -#Time formatting -NLPSolverStatusDialog.Time.Nanoseconds=Nanoseconds -NLPSolverStatusDialog.Time.Microseconds=Microseconds -NLPSolverStatusDialog.Time.Milliseconds=Milliseconds -NLPSolverStatusDialog.Time.Second=Second -NLPSolverStatusDialog.Time.Seconds=Seconds -NLPSolverStatusDialog.Time.Minute=Minute -NLPSolverStatusDialog.Time.Minutes=Minutes -NLPSolverStatusDialog.Time.Hour=Hour -NLPSolverStatusDialog.Time.Hours=Hours -NLPSolverStatusDialog.Time.Day=Day -NLPSolverStatusDialog.Time.Days=Days \ No newline at end of file +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Solver Status + +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Current Solution: +NLPSolverStatusDialog.Controls.lblIteration=Iteration: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnation: +NLPSolverStatusDialog.Controls.lblRuntime=Runtime: +NLPSolverStatusDialog.Controls.btnStop=Stop +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Continue + +#Messages +NLPSolverStatusDialog.Message.StopIteration=Maximum iterations reached. +NLPSolverStatusDialog.Message.StopStagnation=Process stopped due to stagnation. +NLPSolverStatusDialog.Message.StopUser=Process stopped due to user interruption. +NLPSolverStatusDialog.Message.CurrentIteration=Process stopped at iteration %d of %d. + +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanoseconds +NLPSolverStatusDialog.Time.Microseconds=Microseconds +NLPSolverStatusDialog.Time.Milliseconds=Milliseconds +NLPSolverStatusDialog.Time.Second=Second +NLPSolverStatusDialog.Time.Seconds=Seconds +NLPSolverStatusDialog.Time.Minute=Minute +NLPSolverStatusDialog.Time.Minutes=Minutes +NLPSolverStatusDialog.Time.Hour=Hour +NLPSolverStatusDialog.Time.Hours=Hours +NLPSolverStatusDialog.Time.Day=Day +NLPSolverStatusDialog.Time.Days=Days -- cgit