From 245e2bb2b96b14008b19c5c344752e055c6ba20d Mon Sep 17 00:00:00 2001 From: Pablo Cingolani Date: Fri, 19 Dec 2014 09:29:14 -0500 Subject: [PATCH] Project updated --- src/net/sourceforge/jFuzzyLogic/FunctionBlock.java | 2 +- .../jFuzzyLogic/defuzzifier/DefuzzifierCenterOfGravity.java | 2 +- .../jFuzzyLogic/defuzzifier/DefuzzifierContinuous.java | 2 +- .../jFuzzyLogic/membership/MembershipFunction.java | 2 +- .../jFuzzyLogic/membership/MembershipFunctionGaussian.java | 2 +- .../jFuzzyLogic/membership/MembershipFunctionGaussian2.java | 2 +- .../membership/MembershipFunctionGenericSingleton.java | 2 +- .../jFuzzyLogic/membership/MembershipFunctionSigmoidal.java | 2 +- .../jFuzzyLogic/membership/MembershipFunctionSingleton.java | 2 +- .../jFuzzyLogic/membership/MembershipFunctionTriangular.java | 2 +- src/net/sourceforge/jFuzzyLogic/optimization/Parameter.java | 2 +- src/net/sourceforge/jFuzzyLogic/rule/RuleBlock.java | 2 +- src/net/sourceforge/jFuzzyLogic/rule/Variable.java | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/net/sourceforge/jFuzzyLogic/FunctionBlock.java b/src/net/sourceforge/jFuzzyLogic/FunctionBlock.java index 2067fc9..b9b3b28 100644 --- a/src/net/sourceforge/jFuzzyLogic/FunctionBlock.java +++ b/src/net/sourceforge/jFuzzyLogic/FunctionBlock.java @@ -578,7 +578,7 @@ public class FunctionBlock extends FclObject implements Iterable, Com /** * Set a variable * @param variableName : Variable's name - * @param value : variable's value to be setted + * @param value : variable's value to be set * @return this */ public void setVariable(String variableName, double value) { diff --git a/src/net/sourceforge/jFuzzyLogic/defuzzifier/DefuzzifierCenterOfGravity.java b/src/net/sourceforge/jFuzzyLogic/defuzzifier/DefuzzifierCenterOfGravity.java index 40a8bb3..25ac828 100644 --- a/src/net/sourceforge/jFuzzyLogic/defuzzifier/DefuzzifierCenterOfGravity.java +++ b/src/net/sourceforge/jFuzzyLogic/defuzzifier/DefuzzifierCenterOfGravity.java @@ -12,7 +12,7 @@ public class DefuzzifierCenterOfGravity extends DefuzzifierContinuous { super(variable); } - /** Deffuzification function */ + /** Defuzification function */ @Override public double defuzzify() { double x = min, sum = 0, weightedSum = 0; diff --git a/src/net/sourceforge/jFuzzyLogic/defuzzifier/DefuzzifierContinuous.java b/src/net/sourceforge/jFuzzyLogic/defuzzifier/DefuzzifierContinuous.java index 08e4f1e..9711bb3 100644 --- a/src/net/sourceforge/jFuzzyLogic/defuzzifier/DefuzzifierContinuous.java +++ b/src/net/sourceforge/jFuzzyLogic/defuzzifier/DefuzzifierContinuous.java @@ -96,7 +96,7 @@ public abstract class DefuzzifierContinuous extends Defuzzifier { private void init(double min, double max, int numberOfPoints) { values = new double[numberOfPoints]; - // Go on only if min & max are setted + // Go on only if min & max are set if (Double.isNaN(min) || Double.isNaN(max)) return; // Check parameters diff --git a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunction.java b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunction.java index b82600c..819ce5f 100644 --- a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunction.java +++ b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunction.java @@ -27,7 +27,7 @@ public abstract class MembershipFunction extends FclObject { public abstract boolean checkParamters(StringBuffer errors); - /** Try to guess the universe (if not setted) */ + /** Try to guess the universe (if not set) */ public abstract void estimateUniverse(); /** Short name */ diff --git a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGaussian.java b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGaussian.java index feef92d..7ec162f 100644 --- a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGaussian.java +++ b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGaussian.java @@ -39,7 +39,7 @@ public class MembershipFunctionGaussian extends MembershipFunctionContinuous { @Override public void estimateUniverse() { - // Are universeMin and universeMax already setted? => nothing to do + // Are universeMin and universeMax already set? => nothing to do if( (!Double.isNaN(universeMin)) && (!Double.isNaN(universeMax)) ) return; universeMin = parameters[0].getValue() - 4.0 * parameters[1].getValue(); universeMax = parameters[0].getValue() + 4.0 * parameters[1].getValue(); diff --git a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGaussian2.java b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGaussian2.java index 294cebc..00f76dd 100644 --- a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGaussian2.java +++ b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGaussian2.java @@ -46,7 +46,7 @@ public class MembershipFunctionGaussian2 extends MembershipFunctionContinuous { @Override public void estimateUniverse() { - // Are universeMin and universeMax already setted? => nothing to do + // Are universeMin and universeMax already set? => nothing to do if ((!Double.isNaN(universeMin)) && (!Double.isNaN(universeMax))) return; universeMin = parameters[0].getValue() - 4.0 * parameters[1].getValue(); universeMax = parameters[2].getValue() + 4.0 * parameters[3].getValue(); diff --git a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGenericSingleton.java b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGenericSingleton.java index d42a34b..b52a29b 100644 --- a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGenericSingleton.java +++ b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGenericSingleton.java @@ -57,7 +57,7 @@ public class MembershipFunctionGenericSingleton extends MembershipFunctionDiscre @Override public void estimateUniverse() { - // Are universeMin and universeMax already setted? => nothing to do + // Are universeMin and universeMax already set? => nothing to do if( (!Double.isNaN(universeMin)) && (!Double.isNaN(universeMax)) ) return; universeMin = x[0].getValue(); universeMax = x[x.length - 1].getValue(); diff --git a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionSigmoidal.java b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionSigmoidal.java index 2948b10..c4a4555 100644 --- a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionSigmoidal.java +++ b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionSigmoidal.java @@ -33,7 +33,7 @@ public class MembershipFunctionSigmoidal extends MembershipFunctionContinuous { @Override public void estimateUniverse() { - // Are universeMin and universeMax already setted? => nothing to do + // Are universeMin and universeMax already set? => nothing to do if ((!Double.isNaN(universeMin)) && (!Double.isNaN(universeMax))) return; universeMin = parameters[1].getValue() - 9.0 / Math.abs(parameters[0].getValue()); universeMax = parameters[1].getValue() + 9.0 / Math.abs(parameters[0].getValue()); diff --git a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionSingleton.java b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionSingleton.java index 73c647c..5235a12 100644 --- a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionSingleton.java +++ b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionSingleton.java @@ -58,7 +58,7 @@ public class MembershipFunctionSingleton extends MembershipFunctionDiscrete { @Override public void estimateUniverse() { - // Are universeMin and universeMax already setted? => nothing to do + // Are universeMin and universeMax already set? => nothing to do if( (!Double.isNaN(universeMin)) && (!Double.isNaN(universeMax)) ) return; universeMin = parameters[0].getValue(); universeMax = parameters[0].getValue(); diff --git a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionTriangular.java b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionTriangular.java index 09b8657..56f4f56 100644 --- a/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionTriangular.java +++ b/src/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionTriangular.java @@ -45,7 +45,7 @@ public class MembershipFunctionTriangular extends MembershipFunctionContinuous { @Override public void estimateUniverse() { - // Are universeMin and universeMax already setted? => nothing to do + // Are universeMin and universeMax already set? => nothing to do if( (!Double.isNaN(universeMin)) && (!Double.isNaN(universeMax)) ) return; universeMin = parameters[0].getValue(); universeMax = parameters[2].getValue(); diff --git a/src/net/sourceforge/jFuzzyLogic/optimization/Parameter.java b/src/net/sourceforge/jFuzzyLogic/optimization/Parameter.java index bf41baf..bddb9b9 100644 --- a/src/net/sourceforge/jFuzzyLogic/optimization/Parameter.java +++ b/src/net/sourceforge/jFuzzyLogic/optimization/Parameter.java @@ -114,7 +114,7 @@ public abstract class Parameter { /** * Sets parameter to 'value' * @param value - * @return 'true' if setted ok, 'false if can't be setted (e.g. due to consistenci errors, out of range, etc.) + * @return 'true' if set ok, 'false if can't be set (e.g. due to consistenci errors, out of range, etc.) */ public abstract boolean set(double value); diff --git a/src/net/sourceforge/jFuzzyLogic/rule/RuleBlock.java b/src/net/sourceforge/jFuzzyLogic/rule/RuleBlock.java index 47d2a0a..cc07db8 100644 --- a/src/net/sourceforge/jFuzzyLogic/rule/RuleBlock.java +++ b/src/net/sourceforge/jFuzzyLogic/rule/RuleBlock.java @@ -363,7 +363,7 @@ public class RuleBlock extends FclObject implements Iterable, Comparable, Iterabl /** Estimate universe */ public void estimateUniverse() { - // Are universeMin and universeMax already setted? => nothing to do + // Are universeMin and universeMax already set? => nothing to do if ((!Double.isNaN(universeMin)) && (!Double.isNaN(universeMax))) return; // Calculate max / min on every membership function @@ -121,7 +121,7 @@ public class Variable extends FclObject implements Comparable, Iterabl else umin = umax = 0; } - // Set parameters (if not setted) + // Set parameters (if not set) if (Double.isNaN(universeMin)) universeMin = umin; if (Double.isNaN(universeMax)) universeMax = umax; }