[GRASS-SVN] r63915 - in grass/branches/releasebranch_7_0: . lib/arraystats

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-01-01 12:05:23 -0800 (Thu, 01 Jan 2015)
New Revision: 63915

Removed:
   grass/branches/releasebranch_7_0/lib/arraystats/discont.README.txt
Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/arraystats/arraystatslib.dox
Log:
arraystatslib: doxygen update (discont algorithm) and author
               (merge r63913-4 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
 63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
 ,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911
   + /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
 63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
 ,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914

Modified: grass/branches/releasebranch_7_0/lib/arraystats/arraystatslib.dox
===================================================================
--- grass/branches/releasebranch_7_0/lib/arraystats/arraystatslib.dox	2015-01-01 20:03:11 UTC (rev 63914)
+++ grass/branches/releasebranch_7_0/lib/arraystats/arraystatslib.dox	2015-01-01 20:05:23 UTC (rev 63915)
@@ -1,11 +1,65 @@
 /*! \page arraystatslib GRASS Array Statistics Library
 
-by GRASS Development Team (http://grass.osgeo.org)
+by Jean-Pierre Grimmeau, and GRASS Development Team (http://grass.osgeo.org)
 
 \tableofcontents
 
+\section discont The discont algorithm
+
+The discont algorithm systematically searches discontinuities in the slope
+of the cumulated frequencies curve, by approximating this curve through
+straight line segments whose vertices define the class breaks. This
+algorithm is inspired by techniques of automatic line generalization used
+in cartography [1]. The first approximation is a straight line which links
+the two end nodes of the curve. This line is then replaced by a
+two-segmented polyline whose central node is the point on the curve which
+is farthest from the preceding straight line. The point on the curve
+furthest from this new polyline is then chosen as a new node to create
+break up one of the two preceding segments, and so forth. The problem of
+the difference in terms of units between the two axes is solved by
+rescaling both amplitudes to an interval between 0 and 1. In the original
+algorithm, the process is stopped when the difference between the slopes
+of the two new segments is no longer significant. As the slope is the
+ratio between the frequency and the amplitude of the corresponding
+interval, i.e. its density, this effectively tests whether the frequencies
+of the two newly proposed classes are different from those obtained by
+simply distributing the sum of their frequencies amongst them in
+proportion to the class amplitudes. 
+
+The algorithm described above creates class breaks which each are
+identical to a specific observation. It is thus necessary to decide to
+which class these observations should be attributed. It seems logical to
+prefer the densest, i.e. the one with the strongest slope. The
+automatisation of this method allows to distinguish classes with high
+frequencies from those with low frequencies, but also to introduce
+subtleties and to delimit transition classes.
+
+This method, inspired by Jenks' algorithm [2], provides a good analysis of
+the distribution, but not necessarily cartographically satisfying class
+breaks. It is thus up to the cartographer to judge whether all the
+identified breaks are cartographically useful (or whether some should be
+combined) and whether any of the class amplitudes is too large. In the
+latter case, the class should be subdivided into equal intervals
+(arithmetic progression) as by definition, the classes resulting from the
+discont algorithm have a homogeneous interior distribution. If the general
+distribution of the data is close to the normal distribution, it is also
+possible to combine equiprobable class breaks [3] , with their advantage
+of regularity, with discont class breaks for the extremes which often have
+large amplitudes when using equiprobable class breaks.
+
+[1] Douglas, D.H. & Peucker, T.K. (1973) Algorithms for the reduction
+of the number of points required to represent a digitized line or its
+caricature, The Canadian Cartographer, 10, pp. 112-122.
+
+[2] Jenks, G.F. (1963) Generalisation in statistical mapping, Annals
+of the Association of American Geographers, 53, pp.15-26.
+
+[3] Grimmeau, J.P. (1977) Cartographie par plages et discontinuités
+spatiales, Paris, Espace géographique, VI, pp.49-58.
+
 \section listOfFunctios List of functions
 
+- AS_option_to_algorithm()
 - AS_class_apply_algorithm()
 - AS_class_interval()
 - AS_class_quant()
@@ -16,5 +70,8 @@
 - AS_eqdrt()
 - AS_basic_stats()
 
+\section arraystatslibAuthors Authors
+
+- Jean-Pierre Grimmeau at the Free University of Brussels (ULB)
+
 */
-

Deleted: grass/branches/releasebranch_7_0/lib/arraystats/discont.README.txt
===================================================================
--- grass/branches/releasebranch_7_0/lib/arraystats/discont.README.txt	2015-01-01 20:03:11 UTC (rev 63914)
+++ grass/branches/releasebranch_7_0/lib/arraystats/discont.README.txt	2015-01-01 20:05:23 UTC (rev 63915)
@@ -1,49 +0,0 @@
-Discont
-Jean-Pierre Grimmeau - Université Libre de Bruxelles <grimmeau at ulb.ac.be>
-
-The discont algorithm systematically searches discontinuities in the slope
-of the cumulated frequencies curve, by approximating this curve through
-straight line segments whose vertices define the class breaks. This
-algorithm is inspired by techniques of automatic line generalization used
-in cartography [1]. The first approximation is a straight line which links
-the two end nodes of the curve. This line is then replaced by a
-two-segmented polyline whose central node is the point on the curve which
-is farthest from the preceding straight line. The point on the curve
-furthest from this new polyline is then chosen as a new node to create
-break up one of the two preceding segments, and so forth. The problem of
-the difference in terms of units between the two axes is solved by
-rescaling both amplitudes to an interval between 0 and 1. In the original
-algorithm, the process is stopped when the difference between the slopes
-of the two new segments is no longer significant. As the slope is the
-ratio between the frequency and the amplitude of the corresponding
-interval, i.e. its density, this effectively tests whether the frequencies
-of the two newly proposed classes are different from those obtained by
-simply distributing the sum of their frequencies amongst them in
-proportion to the class amplitudes. 
-
-The algorithm described above creates class breaks which each are
-identical to a specific observation. It is thus necessary to decide to
-which class these observations should be attributed. It seems logical to
-prefer the densest, i.e. the one with the strongest slope. The
-automatisation of this method allows to distinguish classes with high
-frequencies from those with low frequencies, but also to introduce
-subtleties and to delimit transition classes.
-
-This method, inspired by Jenks' algorithm [2], provides a good analysis of
-the distribution, but not necessarily cartographically satisfying class
-breaks. It is thus up to the cartographer to judge whether all the
-identified breaks are cartographically useful (or whether some should be
-combined) and whether any of the class amplitudes is too large. In the
-latter case, the class should be subdivided into equal intervals
-(arithmetic progression) as by definition, the classes resulting from the
-discont algorithm have a homogeneous interior distribution. If the general
-distribution of the data is close to the normal distribution, it is also
-possible to combine equiprobable class breaks [3] , with their advantage
-of regularity, with discont class breaks for the extremes which often have
-large amplitudes when using equiprobable class breaks.
-
-[1] Douglas, D.H. & Peucker, T.K. (1973) Algorithms for the reduction of the number of points required to represent a digitized line or its caricature, The Canadian Cartographer, 10, pp. 112-122.
-
-[2] Jenks, G.F. (1963) Generalisation in statistical mapping, Annals of the Association of American Geographers, 53, pp.15-26.
-
-[3] Grimmeau, J.P. (1977) Cartographie par plages et discontinuités spatiales, Paris, Espace géographique, VI, pp.49-58.