[GRASS-SVN] r66201 - grass-addons/grass7/raster/r.mcda.promethee
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Sep 13 14:11:44 PDT 2015
Author: gianluca
Date: 2015-09-13 14:11:44 -0700 (Sun, 13 Sep 2015)
New Revision: 66201
Modified:
grass-addons/grass7/raster/r.mcda.promethee/main.c
grass-addons/grass7/raster/r.mcda.promethee/promethee.c
Log:
-
Modified: grass-addons/grass7/raster/r.mcda.promethee/main.c
===================================================================
--- grass-addons/grass7/raster/r.mcda.promethee/main.c 2015-09-13 21:06:49 UTC (rev 66200)
+++ grass-addons/grass7/raster/r.mcda.promethee/main.c 2015-09-13 21:11:44 UTC (rev 66201)
@@ -187,6 +187,7 @@
outrast_negative_flow = Rast_allocate_buf(DCELL_TYPE);
outrast_net_flow = Rast_allocate_buf(DCELL_TYPE);
+
/* controlling, if we can write the raster */
outfd_positive_flow = Rast_open_new(result_positive_flow, DCELL_TYPE);
outfd_negative_flow = Rast_open_new(result_negative_flow, DCELL_TYPE);
Modified: grass-addons/grass7/raster/r.mcda.promethee/promethee.c
===================================================================
--- grass-addons/grass7/raster/r.mcda.promethee/promethee.c 2015-09-13 21:06:49 UTC (rev 66200)
+++ grass-addons/grass7/raster/r.mcda.promethee/promethee.c 2015-09-13 21:11:44 UTC (rev 66201)
@@ -9,8 +9,7 @@
void build_flow_matrix(int nrows, int ncols, int ncriteria,
double *weight_vect, double ***decision_vol,
- double **positive_flow_vol, double **negative_flow_vol,
- double **net_flow_vol);
+ double **positive_flow_vol, double **negative_flow_vol);
/*
@@ -51,8 +50,7 @@
void build_flow_matrix(int nrows, int ncols, int ncriteria,
double *weight_vect, double ***decision_vol,
- double **positive_flow_vol, double **negative_flow_vol,
- double **net_flow_vol)
+ double **positive_flow_vol, double **negative_flow_vol)
{
int row1, col1, row2, col2;
int i;
@@ -95,11 +93,8 @@
G_message("--");
for (col1 = 0; col1 < ncols; col1++)
{
- //G_percent(col1, (ncols), 2);
positive_flow_vol[row1][col1]=positive_flow_vol[row1][col1]/ncriteria;
negative_flow_vol[row1][col1]=negative_flow_vol[row1][col1]/ncriteria;
- net_flow_vol[row1][col1]=0; //positive_flow_vol[row1][col1]-negative_flow_vol[row1][col1];
- //G_message("%f-%f=%f",positive_flow_vol[row1][col1],negative_flow_vol[row1][col1],net_flow_vol[row1][col1]);
}
}
}
More information about the grass-commit
mailing list