[GRASS-SVN] r56752 - grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jun 17 01:30:42 PDT 2013
Author: hamish
Date: 2013-06-17 01:30:41 -0700 (Mon, 17 Jun 2013)
New Revision: 56752
Modified:
grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/helpers.c
grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h
grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/main.c
grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/r.fuzzy.system.html
grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/system.c
Log:
consistent spelling (ref: http://en.wikipedia.org/wiki/Defuzzification http://www.mathworks.com/help/fuzzy/defuzz.html )
Modified: grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/helpers.c
===================================================================
--- grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/helpers.c 2013-06-17 08:09:41 UTC (rev 56751)
+++ grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/helpers.c 2013-06-17 08:30:41 UTC (rev 56752)
@@ -122,7 +122,7 @@
fprintf(stdout, "ANTECEDENT %s: %5.3f\n", s_rules[i].outname,
antecedents[i]);
- fprintf(stdout, "RESULT (deffuzified): %5.3f\n", result);
+ fprintf(stdout, "RESULT (defuzzified): %5.3f\n", result);
fprintf(stdout, "UNIVERSE,");
for (i = 0; i < nrules; ++i)
Modified: grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h
===================================================================
--- grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h 2013-06-17 08:09:41 UTC (rev 56751)
+++ grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h 2013-06-17 08:30:41 UTC (rev 56752)
@@ -151,7 +151,7 @@
extern int nmaps, nrules, output_index, multiple, membership_only, coor_proc;
extern int resolution;
extern implications implication;
-extern defuzz defuzzyfication;
+extern defuzz defuzzification;
extern logics family;
extern char **rules;
Modified: grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/main.c
===================================================================
--- grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/main.c 2013-06-17 08:09:41 UTC (rev 56751)
+++ grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/main.c 2013-06-17 08:30:41 UTC (rev 56752)
@@ -29,7 +29,7 @@
int nmaps, nrules, output_index, multiple, membership_only, coor_proc;
int resolution;
implications implication;
-defuzz defuzzyfication;
+defuzz defuzzification;
logics family;
char **rules;
@@ -91,7 +91,7 @@
"centroid,bisector,min_of_highest,max_of_highest,mean_of_highest";
par_defuzzify->answer = "bisector";
par_defuzzify->required = YES;
- par_defuzzify->description = _("Defuzzyfication method");
+ par_defuzzify->description = _("Defuzzification method");
par_defuzzify->guisection = _("Advanced options");
par_implication = G_define_option();
@@ -175,15 +175,15 @@
implication = i_PROD;
if (!strcmp(par_defuzzify->answer, "centroid"))
- defuzzyfication = d_CENTEROID;
+ defuzzification = d_CENTEROID;
else if (!strcmp(par_defuzzify->answer, "bisector"))
- defuzzyfication = d_BISECTOR;
+ defuzzification = d_BISECTOR;
else if (!strcmp(par_defuzzify->answer, "min_of_highest"))
- defuzzyfication = d_MINOFHIGHEST;
+ defuzzification = d_MINOFHIGHEST;
else if (!strcmp(par_defuzzify->answer, "max_of_highest"))
- defuzzyfication = d_MAXOFHIGHEST;
+ defuzzification = d_MAXOFHIGHEST;
else if (!strcmp(par_defuzzify->answer, "mean_of_highest"))
- defuzzyfication = d_MEANOFHIGHEST;
+ defuzzification = d_MEANOFHIGHEST;
nrows = Rast_window_rows();
ncols = Rast_window_cols();
Modified: grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/r.fuzzy.system.html
===================================================================
--- grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/r.fuzzy.system.html 2013-06-17 08:09:41 UTC (rev 56751)
+++ grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/r.fuzzy.system.html 2013-06-17 08:30:41 UTC (rev 56752)
@@ -122,10 +122,10 @@
definition. It usually creates triangular consequent set definition.
</ul>
</dd>
-<dt><b>defuzz: defuzzyfication method</b></dt>
-<dd>Before deffuzification all consequents are agregated into one fuzzy set.
+<dt><b>defuzz: defuzzification method</b></dt>
+<dd>Before defuzzification all consequents are agregated into one fuzzy set.
Defuzzification is the process of conversion of aggregated fuzzy set into one
-crisp value. The r.fuzzy.system provides 5 methods of defuzzyfication:
+crisp value. The r.fuzzy.system provides 5 methods of defuzzification:
<ul>
<li><b>centroid</b> center of mass of the fuzzy set (in practise weighted mean);
<li><b>bisector</b> a value which divide fuzzy set on two parts of equal area;
@@ -139,7 +139,7 @@
consequent and agregated fuzzy sets. The resolution provides number of elements
of these fuzzy sets. The minimum and maximum for univese is taken from the
minimal and maximal values of fuzzy set definition of output map Because it has
-strong impact on computation time and precision of deffuzification, values lower
+strong impact on computation time and precision of defuzzification, values lower
than 30 may impact on precision of final result, but values above 200 may slow
down computation time.
</dd>
@@ -161,7 +161,7 @@
<h2>OUTPUTS</h2>
<dl>
<dt><b>output</b></dt>
-<dd>Map containing deffuzified values. Map is always of type FCELLS and contains
+<dd>Map containing defuzzified values. Map is always of type FCELLS and contains
values defined in output universe. The output name must be the same as one of
maps in maps definition file.
</dd>
@@ -231,7 +231,7 @@
To recive final map program calculate partial fuzzy set for all rules and next
agregate it into one fuzzy set. These fuzzy sets are created on value sequence
called universe. Every set has the number of elements equal to universe
-resolution. Such set cannot be stored as map so finally is deffuzified with
+resolution. Such set cannot be stored as map so finally is defuzzified with
method choosen by user.
<p>
First we need two maps created with r.stream package:
Modified: grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/system.c
===================================================================
--- grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/system.c 2013-06-17 08:09:41 UTC (rev 56751)
+++ grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/system.c 2013-06-17 08:30:41 UTC (rev 56752)
@@ -26,7 +26,7 @@
for (j = 0; j < nrules; ++j) {
- if (defuzzyfication > d_BISECTOR && antecedents[j] < max_antecedent &&
+ if (defuzzification > d_BISECTOR && antecedents[j] < max_antecedent &&
!coor_proc)
continue;
@@ -54,7 +54,7 @@
for (i = 0; i < resolution; ++i)
visual_output[i][j + 1] = agregate[i];
- result = defuzzify(defuzzyfication, max_agregate);
+ result = defuzzify(defuzzification, max_agregate);
return result;
}
@@ -160,7 +160,7 @@
-float defuzzify(int defuzzyfication, float max_agregate)
+float defuzzify(int defuzzification, float max_agregate)
{
int i;
float d_value = 0;
@@ -169,7 +169,7 @@
for (i = 0; i < resolution; sum_agregate += agregate[i++]) ;
- switch (defuzzyfication) {
+ switch (defuzzification) {
case d_CENTEROID:
for (i = 0; i < resolution; ++i)
More information about the grass-commit
mailing list