[Freeciv-Dev] Re: (PR#9799) PATCH: rewrited adjust_map()

["Marcelo Burda" <mburda@xxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=9799 >

Le mar 31/08/2004 à 14:43, Jason Short a écrit :
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=9799 >
> 
> Marcelo Burda wrote:
> 
> >>I'm not sure if map.xsize * map.ysize is a real total number of tiles on
> >>a map. Some topology expert should say something about it (That's not me).
> > 
> > that is ok i think ( a topolgy expert)
> 
> It is the correct value.  MAP_MAX_INDEX is probably what should be used. 
>   But this is a misnomer so nobody uses it.
> 
> jason
> 
> 
more than that MAP_MAX_INDEX is undeclared and MAX_MAP_INDEX is buged!
#define MAX_MAP_INDEX map.xsize * map.ysize

has to be
#define MAX_MAP_INDEX (map.xsize * map.ysize)

included in patch, 

sorry for i++, it has to be ++i

LAST CHANGES
some fixes :-)

Marcelo

diff -ruN -Xfreeciv/diff_ignore freeciv/common/map.h freeciv_/common/map.h
--- freeciv/common/map.h        2004-08-26 20:37:52.000000000 +0200
+++ freeciv_/common/map.h       2004-08-31 13:02:14.888124224 +0200
@@ -229,7 +229,7 @@
 void reset_move_costs(int x, int y);
 
 /* Maximum value of index (for sanity checks and allocations) */
-#define MAX_MAP_INDEX map.xsize * map.ysize
+#define MAX_MAP_INDEX (map.xsize * map.ysize)
 
 #ifdef DEBUG
 #define CHECK_MAP_POS(x,y) assert(is_normal_map_pos((x),(y)))
diff -ruN -Xfreeciv/diff_ignore freeciv/server/mapgen.c freeciv_/server/mapgen.c
--- freeciv/server/mapgen.c     2004-08-28 18:50:49.000000000 +0200
+++ freeciv_/server/mapgen.c    2004-08-31 13:04:35.056815344 +0200
@@ -63,7 +63,7 @@
 static void mapgenerator4(void);
 static void mapgenerator5(void);
 static void smooth_map(void);
-static void adjust_map(void);
+static void adjust_hmap(void);
 static void adjust_terrain_param(void);
 
 #define RIVERS_MAXTRIES 32767
@@ -75,8 +75,18 @@
    A value of 2 means river.                            -Erik Sigra */
 static int *river_map;
 
+/*******************************************************************
+ * Height map information
+ ******************************************************************/
 static int *height_map;
-static int maxval=0;
+/* maximum value for height_map after be adjusted */
+static const int maxval = 1000;
+/* after call make_land(), this is the level of sea in height_map */
+static int seaval = 0;
+/* after call make_mountains(), this the minimum level where mountains and hill
+   probably will placed */
+static int  mountainsval = 0;
+
 static int forests=0;
 
 struct isledata {
@@ -106,6 +116,17 @@
    ? MAX_TEMP * (3 + 2 * SQSIZE) / (100 * SQSIZE)              \
    : 5 * MAX_TEMP / 100  /* 5% for all maps */)
 
+/********************************************************************
+ * used to initialize a array with some value
+ ********************************************************************/
+#define INITIALIZE_ARRAY(_a, _size, _val)                            \
+  { \
+    int _ini_index = -1; \
+    for(; ++_ini_index < (_size);) { \
+      (_a)[_ini_index] = (_val); \
+     } \
+  } 
+
 /****************************************************************************
   Returns the temperature of this map position.  This is a value in the
   range of 0 to MAX_TEMP (inclusive).
@@ -293,28 +314,11 @@
   the map.mountains value, so increase map.mountains and you'll get more 
   hills and mountains (and vice versa).
 **************************************************************************/
-static void make_mountains(int thill)
+static void make_mountains(void)
 {
-  int mount;
-  int j;
-
-  for (j = 0; j < 10; j++) {
-    mount = 0;
-    whole_map_iterate(x, y) {
-      if (hmap(x, y) > thill) {
-       mount++;
-      }
-    } whole_map_iterate_end;
-    if (mount < (map_num_tiles() * map.mountains) / 1000) {
-      thill *= 95;
-    } else {
-      thill *= 105;
-    }
-    thill /= 100;
-  }
-  
+  mountainsval = ((maxval - seaval)* (100 - map.mountains)) / 100 + seaval;
   whole_map_iterate(x, y) {
-    if (hmap(x, y) > thill && !is_ocean(map_get_terrain(x,y))) { 
+    if (hmap(x, y) > mountainsval && !is_ocean(map_get_terrain(x,y))) { 
       /* Randomly place hills and mountains on "high" tiles.  But don't
        * put hills near the poles (they're too green). */
       if (myrand(100) > 75 
@@ -1135,37 +1139,20 @@
 **************************************************************************/
 static void make_land(void)
 {
-  int tres;
-  int count=0;
-  int total = (map_num_tiles() * map.landpercent) / 100;
-  int forever=0;
-
-  adjust_map();
+  adjust_hmap();
   normalize_hmap_poles();
-  tres = (maxval * map.landpercent) / 100;
-
-  do {
-    forever++;
-    if (forever>50) break; /* loop elimination */
-    count=0;
-    whole_map_iterate(x, y) {
-      if (hmap(x, y) < tres)
-       map_set_terrain(x, y, T_OCEAN);
-      else {
-       map_set_terrain(x, y, T_NOT_PLACED);
-       count++;
-      }
-    } whole_map_iterate_end;
-    if (count>total)
-      tres*=11;
-    else
-      tres*=9;
-    tres/=10;
-  } while (abs(total-count)> maxval/40);
+  seaval = (maxval *(100 - map.landpercent)) / 100;
+  whole_map_iterate(x, y) {
+    if (hmap(x, y) < seaval)
+      map_set_terrain(x, y, T_OCEAN);
+    else {
+      map_set_terrain(x, y, T_NOT_PLACED);
+    }
+  } whole_map_iterate_end;
 
   renormalize_hmap_poles();
   make_polar_land(); /* make extra land at poles*/
-  make_mountains(maxval*8/10);
+  make_mountains();
   make_arctic();
   make_tundra();
   make_forests();
@@ -1643,25 +1630,45 @@
 }
 
 /**************************************************************************
-  Adjust the map so that its minimum height is 0.  This raises or lowers
-  every position by a fixed amount and sets the "maxval" global variable
-  to hold the maximum height.
+  Adjust the hmap to be a linearize distribution of heights
+  form 0 to maxval (maxval is a global const )
+  
+  ( hmap[x,y] < 0.13 * maxval) handle the 13% lowerest part of the map
+  slope can globaly be estiamted as maxval*sqrt(num_of_isles)/linear_size
 **************************************************************************/
-static void adjust_map(void)
+static void adjust_hmap(void)
 {
-  int minval = maxval = hnat(0, 0);
+  int i, min = hnat(0, 0), max = min;
+  int count = 0, frequencies[maxval];
+  
+  INITIALIZE_ARRAY(frequencies, maxval, 0);
 
   /* Determine minimum and maximum heights. */
   whole_map_iterate(x, y) {
-    maxval = MAX(maxval, hmap(x, y));
-    minval = MIN(minval, hmap(x, y));
+    max = MAX(max, hmap(x, y));
+    min = MIN(min, hmap(x, y));
   } whole_map_iterate_end;
 
-  /* Translate heights so the minimum height is 0. */
-  maxval -= minval;
+  /* Translate heights so the minimum height is 0 and  maximum is maxval.
+     and count the number of accurnecies in all values to initialise the 
+     frequencies[] (frequency is the right word in probability for it) */
+  max -= min;
   whole_map_iterate(x, y) {
-    hmap(x, y) -= minval;
+    hmap(x, y) = (hmap(x, y) - min) * maxval;
+    hmap(x, y) /= max;
+    frequencies[hmap(x, y)]++;
   } whole_map_iterate_end;
+
+  /* create the linearize function as "incremental" frequencies */
+  for(i =  -1; (++i) < maxval;) {
+      count += frequencies[i]; 
+      frequencies[i] = (count * maxval ) / MAX_MAP_INDEX;
+     }
+
+  /* apply the linearize function */
+  whole_map_iterate(x, y) {
+    hmap(x, y) = frequencies[hmap(x, y)];
+  } whole_map_iterate_end; 
 }
 
 /**************************************************************************