diff --git a/html/fcl/tipper.cpp b/html/fcl/tipper.cpp index b8c2a8c..45abea9 100644 --- a/html/fcl/tipper.cpp +++ b/html/fcl/tipper.cpp @@ -84,7 +84,7 @@ void FunctionBlock_tipper::calc_No1() { double x = 0.0 + i * 0.03; double membership = membership_tip_cheap(x); double y = ruleActivationMethod_min( degreeOfSupport_1 , membership ); - defuzzify_tip[i] += ruleAccumulationMethod_max( defuzzify_tip[i], y ); + defuzzify_tip[i] = ruleAccumulationMethod_max( defuzzify_tip[i], y ); } } @@ -95,7 +95,7 @@ void FunctionBlock_tipper::calc_No1() { double x = 0.0 + i * 0.03; double membership = membership_tip_average(x); double y = ruleActivationMethod_min( degreeOfSupport_2 , membership ); - defuzzify_tip[i] += ruleAccumulationMethod_max( defuzzify_tip[i], y ); + defuzzify_tip[i] = ruleAccumulationMethod_max( defuzzify_tip[i], y ); } } @@ -106,7 +106,7 @@ void FunctionBlock_tipper::calc_No1() { double x = 0.0 + i * 0.03; double membership = membership_tip_generous(x); double y = ruleActivationMethod_min( degreeOfSupport_3 , membership ); - defuzzify_tip[i] += ruleAccumulationMethod_max( defuzzify_tip[i], y ); + defuzzify_tip[i] = ruleAccumulationMethod_max( defuzzify_tip[i], y ); } } diff --git a/out/artifacts/jFuzzyLogic_jar/jFuzzyLogic.jar b/out/artifacts/jFuzzyLogic_jar/jFuzzyLogic.jar new file mode 100644 index 0000000..4db8b79 Binary files /dev/null and b/out/artifacts/jFuzzyLogic_jar/jFuzzyLogic.jar differ diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000..ff822c2 --- /dev/null +++ b/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: net.sourceforge.jFuzzyLogic.JFuzzyLogic + diff --git a/src/main/java/net/sourceforge/jFuzzyLogic/JFuzzyLogic.java b/src/main/java/net/sourceforge/jFuzzyLogic/JFuzzyLogic.java index f0eb1ff..d28a34f 100644 --- a/src/main/java/net/sourceforge/jFuzzyLogic/JFuzzyLogic.java +++ b/src/main/java/net/sourceforge/jFuzzyLogic/JFuzzyLogic.java @@ -1,5 +1,6 @@ package net.sourceforge.jFuzzyLogic; +import net.sourceforge.jFuzzyLogic.ruleConnectionMethod.Szczepanski; import org.antlr.runtime.RecognitionException; import net.sourceforge.jFuzzyLogic.demo.tipper.TipperAnimation; @@ -20,10 +21,10 @@ public class JFuzzyLogic { // Version info public static final String SOFTWARE_NAME = "JFuzzyLogic"; public static final String REVISION = ""; - public static final String BUILD = "2015-04-09"; - public static final String VERSION_MAJOR = "3.3"; + public static final String BUILD = "2022-05-12"; + public static final String VERSION_MAJOR = "4.0"; public static final String VERSION_SHORT = VERSION_MAJOR + REVISION; - public static final String VERSION_NO_NAME = VERSION_SHORT + " (build " + BUILD + "), by " + Pcingola.BY; + public static final String VERSION_NO_NAME = VERSION_SHORT + " (build " + BUILD + "), by " + Pcingola.BY + " and " + Szczepanski.BY; public static final String VERSION = SOFTWARE_NAME + " " + VERSION_NO_NAME; public static boolean debug = false; diff --git a/src/main/java/net/sourceforge/jFuzzyLogic/ruleActivationMethod/RuleActivationMethod.java b/src/main/java/net/sourceforge/jFuzzyLogic/ruleActivationMethod/RuleActivationMethod.java index 55a9bca..91a3748 100644 --- a/src/main/java/net/sourceforge/jFuzzyLogic/ruleActivationMethod/RuleActivationMethod.java +++ b/src/main/java/net/sourceforge/jFuzzyLogic/ruleActivationMethod/RuleActivationMethod.java @@ -148,7 +148,7 @@ public abstract class RuleActivationMethod extends FclObject { out.append("\t\t\tdouble y = " + toStringCpp() + "( " + degreeOfSupportName + " , membership );\n"); // Aggregate value - out.append("\t\t\t" + variable.toStringCppDefuzzifyVarName() + "[i] += " + ruleAccumulationMethod.toStringCpp() + "( " + variable.toStringCppDefuzzifyVarName() + "[i], y );\n"); + out.append("\t\t\t" + variable.toStringCppDefuzzifyVarName() + "[i] = " + ruleAccumulationMethod.toStringCpp() + "( " + variable.toStringCppDefuzzifyVarName() + "[i], y );\n"); out.append("\t\t}\n"); out.append("\t}\n"); } diff --git a/src/main/java/net/sourceforge/jFuzzyLogic/ruleConnectionMethod/Szczepanski.java b/src/main/java/net/sourceforge/jFuzzyLogic/ruleConnectionMethod/Szczepanski.java new file mode 100644 index 0000000..a77d999 --- /dev/null +++ b/src/main/java/net/sourceforge/jFuzzyLogic/ruleConnectionMethod/Szczepanski.java @@ -0,0 +1,11 @@ +package net.sourceforge.jFuzzyLogic.ruleConnectionMethod; + +/** + * Author's data + * @author marcin-szczepanski + */ +public class Szczepanski { + + public static final String EMAIL = "marcin.szczepanski@amu.edu.pl"; + public static final String BY = "Marcin Szczepanski"; +} diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..ff822c2 --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: net.sourceforge.jFuzzyLogic.JFuzzyLogic +