[GRASS-SVN] r56876 - in grass-addons/grass7/raster: r.mcda.ahp r.mcda.input r.mcda.output r.mcda.roughset

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Jun 22 02:02:42 PDT 2013


Author: neteler
Date: 2013-06-22 02:02:40 -0700 (Sat, 22 Jun 2013)
New Revision: 56876

Added:
   grass-addons/grass7/raster/r.mcda.ahp/r.mcda.ahp.py.html
   grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py.html
   grass-addons/grass7/raster/r.mcda.output/r.mcda.output.py.html
   grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py.html
Removed:
   grass-addons/grass7/raster/r.mcda.ahp/description.html
   grass-addons/grass7/raster/r.mcda.input/description.html
   grass-addons/grass7/raster/r.mcda.output/description.html
   grass-addons/grass7/raster/r.mcda.roughset/description.html
Modified:
   grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py
   grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py
Log:
r.mcda.*: fix html page name; delete non-existing 'answer:' from flag descriptions

Deleted: grass-addons/grass7/raster/r.mcda.ahp/description.html
===================================================================
--- grass-addons/grass7/raster/r.mcda.ahp/description.html	2013-06-22 08:58:03 UTC (rev 56875)
+++ grass-addons/grass7/raster/r.mcda.ahp/description.html	2013-06-22 09:02:40 UTC (rev 56876)
@@ -1,33 +0,0 @@
-<h2>DESCRIPTION</h2>
-<p>The <em>r.mcda.ahp</em> Generate a raster map classified with analytic hierarchy process (AHP) [Saaty, 1977 and Saaty & Vargas, 1991]</p>
-<em>(GRASS python Script)</em>
-<p></p>
-<h2>NOTES</h2>
-<p>It is mandatory to build a pairwise comparation table with the same order of input of criteria maps in the criteria field.</p>
-<p>Example: r.mcda.ahp criteria=reclass_slope,reclass_sand,reclass_elev pairwise=pairwise output=outputMap</p>
-<p>The file "pairwise" has to have a structure like this:</p>
-<p>#start file</p>
-<p>1.0, 0.2, 3.0</p>
-<p>5.0, 1.0, 5.0</p>
-<p>0.3, 0.2, 1.0</p>
-<p>#comment: order: reclass_slope,reclass_sand,reclass_</p>
-<p>#end file</p>
-The first row and first column are related to the first criteria (reclass_slope in our case); the second row and second column are related to the second criteria (reclass_sand in our case) and the third row and third column are related to the third criteria
- ( reclass_elev in our cas), and so on.
-<p>In the work directory should be generated a log.txt file were you can find additional information like: eigenvectors, eigenvalues, weights</p>
-<h2>TODO</h2>
-<h2>SEE ALSO</h2>
-<em>
-<a href="r.roughset.html">r.roughset</a>,
-<a href="r.mcda.regime.html">r.mcda.regime</a>,
-<a href="r.mcda.fuzzy.html">r.mcda.fuzzy</a>
-<a href="r.mcda.electre.html">r.mcda.electre</a>,
-<a href="r.mcda.roughset.html">r.mcda.roughset</a>
-<a href="r.in.drsa.html">r.in.drsa</a>
-<a href="r.to.drsa.html">r.to.drsa</a>
-</em>
-<h2>AUTHORS</h2>
-Antonio Boggia - Gianluca Massei<br>
-Department of Economics and Appraisal - University of Perugia - Italy
-<p><i>Last changed: $Date$</i>
-

Copied: grass-addons/grass7/raster/r.mcda.ahp/r.mcda.ahp.py.html (from rev 56874, grass-addons/grass7/raster/r.mcda.ahp/description.html)
===================================================================
--- grass-addons/grass7/raster/r.mcda.ahp/r.mcda.ahp.py.html	                        (rev 0)
+++ grass-addons/grass7/raster/r.mcda.ahp/r.mcda.ahp.py.html	2013-06-22 09:02:40 UTC (rev 56876)
@@ -0,0 +1,33 @@
+<h2>DESCRIPTION</h2>
+<p>The <em>r.mcda.ahp</em> Generate a raster map classified with analytic hierarchy process (AHP) [Saaty, 1977 and Saaty & Vargas, 1991]</p>
+<em>(GRASS python Script)</em>
+<p></p>
+<h2>NOTES</h2>
+<p>It is mandatory to build a pairwise comparation table with the same order of input of criteria maps in the criteria field.</p>
+<p>Example: r.mcda.ahp criteria=reclass_slope,reclass_sand,reclass_elev pairwise=pairwise output=outputMap</p>
+<p>The file "pairwise" has to have a structure like this:</p>
+<p>#start file</p>
+<p>1.0, 0.2, 3.0</p>
+<p>5.0, 1.0, 5.0</p>
+<p>0.3, 0.2, 1.0</p>
+<p>#comment: order: reclass_slope,reclass_sand,reclass_</p>
+<p>#end file</p>
+The first row and first column are related to the first criteria (reclass_slope in our case); the second row and second column are related to the second criteria (reclass_sand in our case) and the third row and third column are related to the third criteria
+ ( reclass_elev in our cas), and so on.
+<p>In the work directory should be generated a log.txt file were you can find additional information like: eigenvectors, eigenvalues, weights</p>
+<h2>TODO</h2>
+<h2>SEE ALSO</h2>
+<em>
+<a href="r.roughset.html">r.roughset</a>,
+<a href="r.mcda.regime.html">r.mcda.regime</a>,
+<a href="r.mcda.fuzzy.html">r.mcda.fuzzy</a>
+<a href="r.mcda.electre.html">r.mcda.electre</a>,
+<a href="r.mcda.roughset.html">r.mcda.roughset</a>
+<a href="r.in.drsa.html">r.in.drsa</a>
+<a href="r.to.drsa.html">r.to.drsa</a>
+</em>
+<h2>AUTHORS</h2>
+Antonio Boggia - Gianluca Massei<br>
+Department of Economics and Appraisal - University of Perugia - Italy
+<p><i>Last changed: $Date$</i>
+

Deleted: grass-addons/grass7/raster/r.mcda.input/description.html
===================================================================
--- grass-addons/grass7/raster/r.mcda.input/description.html	2013-06-22 08:58:03 UTC (rev 56875)
+++ grass-addons/grass7/raster/r.mcda.input/description.html	2013-06-22 09:02:40 UTC (rev 56876)
@@ -1,33 +0,0 @@
-<h2>DESCRIPTION</h2>
-<p>The <em>r.mcda.input</em> module will read a  *rls file output from
-jMAF, JAMM or 4eMka2 sofware <a href="http://idss.cs.put.poznan.pl/">
-Laboratory of Intelligent Decision Support Systems - Poznan University.</a>
-and returns maps of the rules </p>
-
-<em>(GRASS python Script)</em>
-
-<h2>NOTES</h2>
-
-
-<h2>TODO</h2>
-
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="r.roughset.html">r.roughset</a>,
-<a href="r.mcda.regime.html">r.mcda.regime</a>,
-<a href="r.mcda.fuzzy.html">r.mcda.fuzzy</a>
-<a href="r.mcda.electre.html">r.mcda.electre</a>,
-<a href="r.mcda.ahp.html">r.mcda.ahp</a>
-<a href="r.mcda.roughset.html">r.mcda.roughset</a>
-<a href="r.mcda.input.html">r.mcda.input</a>
-<a href="r.mcda.output.html">r.mcda.output</a>
-</em>
-
-<h2>AUTHORS</h2>
-Antonio Boggia - Gianluca Massei<br>
-Department of Economics and Appraisal - University of Perugia - Italy 
-<p>
-
-<i>Last changed: $Date$</i>

Modified: grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py
===================================================================
--- grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py	2013-06-22 08:58:03 UTC (rev 56875)
+++ grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py	2013-06-22 09:02:40 UTC (rev 56876)
@@ -36,7 +36,6 @@
 #%flag
 #% key:k 
 #% description:file *.rls from software 4eMka2
-#% answer:true
 #%end
 #%flag
 #% key:j 
@@ -45,7 +44,6 @@
 #%flag
 #% key: l
 #% description: do not remove single rules in vector format
-#% answer:false
 #%end
 
 

Copied: grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py.html (from rev 56874, grass-addons/grass7/raster/r.mcda.input/description.html)
===================================================================
--- grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py.html	                        (rev 0)
+++ grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py.html	2013-06-22 09:02:40 UTC (rev 56876)
@@ -0,0 +1,33 @@
+<h2>DESCRIPTION</h2>
+<p>The <em>r.mcda.input</em> module will read a  *rls file output from
+jMAF, JAMM or 4eMka2 sofware <a href="http://idss.cs.put.poznan.pl/">
+Laboratory of Intelligent Decision Support Systems - Poznan University.</a>
+and returns maps of the rules </p>
+
+<em>(GRASS python Script)</em>
+
+<h2>NOTES</h2>
+
+
+<h2>TODO</h2>
+
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="r.roughset.html">r.roughset</a>,
+<a href="r.mcda.regime.html">r.mcda.regime</a>,
+<a href="r.mcda.fuzzy.html">r.mcda.fuzzy</a>
+<a href="r.mcda.electre.html">r.mcda.electre</a>,
+<a href="r.mcda.ahp.html">r.mcda.ahp</a>
+<a href="r.mcda.roughset.html">r.mcda.roughset</a>
+<a href="r.mcda.input.html">r.mcda.input</a>
+<a href="r.mcda.output.html">r.mcda.output</a>
+</em>
+
+<h2>AUTHORS</h2>
+Antonio Boggia - Gianluca Massei<br>
+Department of Economics and Appraisal - University of Perugia - Italy 
+<p>
+
+<i>Last changed: $Date$</i>

Deleted: grass-addons/grass7/raster/r.mcda.output/description.html
===================================================================
--- grass-addons/grass7/raster/r.mcda.output/description.html	2013-06-22 08:58:03 UTC (rev 56875)
+++ grass-addons/grass7/raster/r.mcda.output/description.html	2013-06-22 09:02:40 UTC (rev 56876)
@@ -1,36 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-The <em>r.mcda.output</em> module will export raster maps as a *isf file
-readable in jMAF, JAMM or 4eMka2 sofware <a href="http://idss.cs.put.poznan.pl/">Laboratory of Intelligent Decision Support Systems - Poznan University.</a>
-<p>
-<em>(GRASS python Script)</em>
-
-<h2>NOTES</h2>
-
-
-<p>
-This module, as all GRASS raster modules, will export cells based on the
-current region settings. See the <em>g.region</em> module for details.
-
-
-<h2>TODO</h2>
-
-
-
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="r.roughset.html">r.roughset</a>,
-<a href="r.mcda.regime.html">r.mcda.regime</a>
-<a href="r.mcda.fuzzy.html">r.mcda.fuzzy</a>
-<a href="r.mcda.electre.html">r.mcda.electre</a>
-<a href="r.mcda.roughset.html">r.mcda.roughset</a>,
-<a href="r.mcda.input.html">r.mcda.input</a>
-</em>
-
-<h2>AUTHORS</h2>
-Antonio Boggia - Gianluca Massei<br>
-Department of Economics and Appraisal - University of Perugia - Italy 
-<p>
-<i>Last changed: $Date$</i>

Copied: grass-addons/grass7/raster/r.mcda.output/r.mcda.output.py.html (from rev 56874, grass-addons/grass7/raster/r.mcda.output/description.html)
===================================================================
--- grass-addons/grass7/raster/r.mcda.output/r.mcda.output.py.html	                        (rev 0)
+++ grass-addons/grass7/raster/r.mcda.output/r.mcda.output.py.html	2013-06-22 09:02:40 UTC (rev 56876)
@@ -0,0 +1,36 @@
+<h2>DESCRIPTION</h2>
+
+The <em>r.mcda.output</em> module will export raster maps as a *isf file
+readable in jMAF, JAMM or 4eMka2 sofware <a href="http://idss.cs.put.poznan.pl/">Laboratory of Intelligent Decision Support Systems - Poznan University.</a>
+<p>
+<em>(GRASS python Script)</em>
+
+<h2>NOTES</h2>
+
+
+<p>
+This module, as all GRASS raster modules, will export cells based on the
+current region settings. See the <em>g.region</em> module for details.
+
+
+<h2>TODO</h2>
+
+
+
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="r.roughset.html">r.roughset</a>,
+<a href="r.mcda.regime.html">r.mcda.regime</a>
+<a href="r.mcda.fuzzy.html">r.mcda.fuzzy</a>
+<a href="r.mcda.electre.html">r.mcda.electre</a>
+<a href="r.mcda.roughset.html">r.mcda.roughset</a>,
+<a href="r.mcda.input.html">r.mcda.input</a>
+</em>
+
+<h2>AUTHORS</h2>
+Antonio Boggia - Gianluca Massei<br>
+Department of Economics and Appraisal - University of Perugia - Italy 
+<p>
+<i>Last changed: $Date$</i>

Deleted: grass-addons/grass7/raster/r.mcda.roughset/description.html
===================================================================
--- grass-addons/grass7/raster/r.mcda.roughset/description.html	2013-06-22 08:58:03 UTC (rev 56875)
+++ grass-addons/grass7/raster/r.mcda.roughset/description.html	2013-06-22 09:02:40 UTC (rev 56876)
@@ -1,31 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-<em>r.mcda.roughset</em> is the python implementation of the dominance rough set approach (Domlem algorithm) in GRASS GIS environment. It requires the following input:
-<br>1. the geographical criteria constituting the information system for the rough set analysis; they have to describe environmental, economic or social issues(<b>criteria</b>=<em>name[,name,...]</em>);<br> 2. the preference (<b>preferences</b>=<em>character</em>)for each criteria used in analysis (gain or cost with comma separator)<br>3. the theme in which areas with the issues to be studied are classified (with crescent preference values) (<b>decision</b>=<em>string</em>).
-
-<p>An information system is generated and Domlem algorithm is applied for extraction a minimal set of rules.</P>  The algorithm builds two text  files (<b>outputTxt</b>=<em>name</em>): the first with isf extension for more deep  analysis with non geographic software like 4emka and  JAMM ; the second file with rls extension hold all the set of rules generate. An output map (<b>outputMap</b>=<em>string</em>)is generated for  region  classification with the rules finded and the criteria stored in GRASS geodb.
-
-<h2>NOTES</h2>
-<p> The module can work very slowly with high number of criteria and sample. For bug please contact Gianluca Massei (g_mass at libero.it)</P>
-
-
-<h2>REFERENCE</h2>
-<ol>
-	<li><p>Greco S., Matarazzo B., Slowinski R.: <i>Rough sets theory for multicriteria decision analysis</i>. European Journal of Operational Research, 129, 1 (2001) 1-47.</P>
-	<li><p>Greco S., Matarazzo B., Slowinski R.:<i> Multicriteria classification by dominance-based rough set approach</i>. In: W.Kloesgen and J.Zytkow (eds.), Handbook of Data Mining and Knowledge Discovery, Oxford University Press, New York, 2002.</P>
-	<li><p>Greco S., Matarazzo B., Slowinski, R., Stefanowski, J.: <i>An Algorithm for Induction of Decision Rules Consistent with the Dominance Principle</i>. In W. Ziarko, Y. Yao (eds.): Rough Sets and Current Trends in Computing. Lecture Notes in Artificial Intelligence 2005 (2001) 304 - 313. Springer-Verlag</P>
-	<li><p>Greco, S., B. Matarazzo, R. Slowinski and J. Stefanowski:<i> Variable consistency model of dominance-based rough set approach.</i> In W.Ziarko, Y.Yao (eds.): Rough Sets and Current Trends in Computing. Lecture Notes in Artificial Intelligence 2005 (2001) 170 - 181. Springer-Verlag</P>
-	<li><p><a href="http://en.wikipedia.org/wiki/Dominance-based_rough_set_approach">http://en.wikipedia.org/wiki/Dominance-based_rough_set_approach</a> - “Dominance-based rough set approach”</P>
-	<li><p><a href="http://idss.cs.put.poznan.pl/site/software.html">http://idss.cs.put.poznan.pl/site/software.html</a> - Software from Laboratory of intelligent decision support system in Poznam University of Technology
-	</P>
-</ol>
-
-<h2>SEE ALSO</h2>
-<p><em>r.mcda.fuzzy, r.mcda.electre, r.mcda.regime, r.to.drsa, r.in.drsa</em></P>
-
-<h2>AUTHORS</h2>
-Antonio Boggia - Gianluca Massei<br>
-Department of Economics and Appraisal - University of Perugia - Italy 
-
-<p>
-<i>Last changed: $Date$</i>

Modified: grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py
===================================================================
--- grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py	2013-06-22 08:58:03 UTC (rev 56875)
+++ grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py	2013-06-22 09:02:40 UTC (rev 56876)
@@ -60,12 +60,10 @@
 #%flag
 #% key: l
 #% description: do not remove single rules in vector format
-#% answer:false
 #%end
 #%flag
 #% key: n
 #% description: compute null value as zero
-#% answer:true
 #%end
 
 import sys

Copied: grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py.html (from rev 56874, grass-addons/grass7/raster/r.mcda.roughset/description.html)
===================================================================
--- grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py.html	                        (rev 0)
+++ grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py.html	2013-06-22 09:02:40 UTC (rev 56876)
@@ -0,0 +1,31 @@
+<h2>DESCRIPTION</h2>
+
+<em>r.mcda.roughset</em> is the python implementation of the dominance rough set approach (Domlem algorithm) in GRASS GIS environment. It requires the following input:
+<br>1. the geographical criteria constituting the information system for the rough set analysis; they have to describe environmental, economic or social issues(<b>criteria</b>=<em>name[,name,...]</em>);<br> 2. the preference (<b>preferences</b>=<em>character</em>)for each criteria used in analysis (gain or cost with comma separator)<br>3. the theme in which areas with the issues to be studied are classified (with crescent preference values) (<b>decision</b>=<em>string</em>).
+
+<p>An information system is generated and Domlem algorithm is applied for extraction a minimal set of rules.</P>  The algorithm builds two text  files (<b>outputTxt</b>=<em>name</em>): the first with isf extension for more deep  analysis with non geographic software like 4emka and  JAMM ; the second file with rls extension hold all the set of rules generate. An output map (<b>outputMap</b>=<em>string</em>)is generated for  region  classification with the rules finded and the criteria stored in GRASS geodb.
+
+<h2>NOTES</h2>
+<p> The module can work very slowly with high number of criteria and sample. For bug please contact Gianluca Massei (g_mass at libero.it)</P>
+
+
+<h2>REFERENCE</h2>
+<ol>
+	<li><p>Greco S., Matarazzo B., Slowinski R.: <i>Rough sets theory for multicriteria decision analysis</i>. European Journal of Operational Research, 129, 1 (2001) 1-47.</P>
+	<li><p>Greco S., Matarazzo B., Slowinski R.:<i> Multicriteria classification by dominance-based rough set approach</i>. In: W.Kloesgen and J.Zytkow (eds.), Handbook of Data Mining and Knowledge Discovery, Oxford University Press, New York, 2002.</P>
+	<li><p>Greco S., Matarazzo B., Slowinski, R., Stefanowski, J.: <i>An Algorithm for Induction of Decision Rules Consistent with the Dominance Principle</i>. In W. Ziarko, Y. Yao (eds.): Rough Sets and Current Trends in Computing. Lecture Notes in Artificial Intelligence 2005 (2001) 304 - 313. Springer-Verlag</P>
+	<li><p>Greco, S., B. Matarazzo, R. Slowinski and J. Stefanowski:<i> Variable consistency model of dominance-based rough set approach.</i> In W.Ziarko, Y.Yao (eds.): Rough Sets and Current Trends in Computing. Lecture Notes in Artificial Intelligence 2005 (2001) 170 - 181. Springer-Verlag</P>
+	<li><p><a href="http://en.wikipedia.org/wiki/Dominance-based_rough_set_approach">http://en.wikipedia.org/wiki/Dominance-based_rough_set_approach</a> - “Dominance-based rough set approach”</P>
+	<li><p><a href="http://idss.cs.put.poznan.pl/site/software.html">http://idss.cs.put.poznan.pl/site/software.html</a> - Software from Laboratory of intelligent decision support system in Poznam University of Technology
+	</P>
+</ol>
+
+<h2>SEE ALSO</h2>
+<p><em>r.mcda.fuzzy, r.mcda.electre, r.mcda.regime, r.to.drsa, r.in.drsa</em></P>
+
+<h2>AUTHORS</h2>
+Antonio Boggia - Gianluca Massei<br>
+Department of Economics and Appraisal - University of Perugia - Italy 
+
+<p>
+<i>Last changed: $Date$</i>



More information about the grass-commit mailing list