marcinsz/jFuzzyLogic
1
0
Fork 0
mirror of https://github.com/marcin-szczepanski/jFuzzyLogic.git synced 2024-12-18 16:35:27 +01:00
Code Issues Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
marcin-szczepanski 2022-05-12 11:29:56 +02:00
parent 5783f490a4
commit c9453b7c53
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
out/artifacts/jFuzzyLogic_jar/jFuzzyLogic.jar
View File

Binary file not shown.

24
src/main/java/net/sourceforge/jFuzzyLogic/defuzzifier/DefuzzifierMeanMax.java
View File

@ -15,28 +15,38 @@ public class DefuzzifierMeanMax extends DefuzzifierContinuous {
/** Deffuzification function */ /** Deffuzification function */
@Override @Override
public double defuzzify() { public double defuzzify() {
/**
* Fixes:
* @author mdsflyboy
*/
double max = 0, maxX = 0; double max = 0, maxX = 0;
int count = 0;
// Calculate max // Calculate max
for( int i = 0; i < values.length; i++ ) { for (double value : values) {
if( values[i] >= max ) max = values[i]; if (value >= max)
max = value;
} }
// No max? => this variable has no active antecedent // No max? => this variable has no active antecedent
if (max <= 0) return Double.NaN; if (max <= 0) return Double.NaN;
// Calculate mean of max // Calculate mean of max
boolean isFirstMax = false;
int startOfMax = 0;
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {
if (values[i] == max) { if (values[i] == max) {
maxX += min + stepSize * i; if (!isFirstMax){
count++; isFirstMax = true;
startOfMax = i;
}
maxX = i;
} }
} }
// Return mean of max // Return mean of max
return maxX / count; int middleI = (int) ((maxX + startOfMax) / 2);
return min + stepSize * middleI;
} }
@Override @Override

4
src/main/java/net/sourceforge/jFuzzyLogic/membership/MembershipFunctionGenBell.java
View File

@ -64,12 +64,12 @@ public class MembershipFunctionGenBell extends MembershipFunctionContinuous {
*/ */
@Override @Override
public String toString() { public String toString() {
return getName() + " : " + " , " + parameters[0] + parameters[1] + " , " + parameters[2]; return getName() + " : " + parameters[1] + " , " + parameters[2] + " , " + parameters[0];
} }
/** FCL representation */ /** FCL representation */
@Override @Override
public String toStringFcl() { public String toStringFcl() {
return "GBELL " + parameters[0] + " " + parameters[1] + " " + parameters[2]; return "GBELL " + parameters[1] + " " + parameters[2] + " " + parameters[0];
} }
} }