[GRASS-SVN] r65819 - grass-addons/grass7/raster/r.mcda.electre

[svn_grass at osgeo.org]

Author: gianluca
Date: 2015-08-03 09:42:42 -0700 (Mon, 03 Aug 2015)
New Revision: 65819

Modified:
   grass-addons/grass7/raster/r.mcda.electre/dominance.c
   grass-addons/grass7/raster/r.mcda.electre/main.c
Log:
-

Modified: grass-addons/grass7/raster/r.mcda.electre/dominance.c
===================================================================
--- grass-addons/grass7/raster/r.mcda.electre/dominance.c	2015-08-03 12:54:05 UTC (rev 65818)
+++ grass-addons/grass7/raster/r.mcda.electre/dominance.c	2015-08-03 16:42:42 UTC (rev 65819)
@@ -80,8 +80,8 @@
 						d = decision_vol[row1][col1][i] - decision_vol[row2][col2][i];
                         if (d >= 0 )
                             conc += weight_vect[i];
-                        if (d < disc)	/*WARNING: if(d>conc) */
-                            /**/ disc = -d;
+                        if (d > disc)	/*WARNING: if(d>conc) */
+                            disc = d;
                     }
                     row_sum_conc[k] += conc;
                     col_sum_conc[j] += conc;

Modified: grass-addons/grass7/raster/r.mcda.electre/main.c
===================================================================
--- grass-addons/grass7/raster/r.mcda.electre/main.c	2015-08-03 12:54:05 UTC (rev 65818)
+++ grass-addons/grass7/raster/r.mcda.electre/main.c	2015-08-03 16:42:42 UTC (rev 65819)
@@ -71,7 +71,7 @@
     weight->type       = TYPE_DOUBLE;
     weight->required   = YES;
     weight->multiple   = YES;
-    weight->description = _("Criteria weight(s) (w1,w2,..)");
+    weight->description = _("Criteria weight(s) (w1,w2,..wn)");
 
     concordance = G_define_option(); /* Allocates memory for the Option structure and returns a pointer to this memory */
     concordance->key = "concordance";