[Freeciv-Dev] Re: (PR#8632) Easy way to set map size with auto ratios (seteables if desired)

["Marcelo Burda" <mburda@xxxxxxxxx>]

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

Hi,
i am add some log code tu inform of seted sizes and errors
and i am move ratio to internal case to avoid user to see it too easy
for me there are no more changed to be done 
Marcelo

diff -ruN -Xfreeciv/diff_ignore freeciv/client/packhand.c 
freeciv_/client/packhand.c
--- freeciv/client/packhand.c   2004-05-23 15:20:35.000000000 +0200
+++ freeciv_/client/packhand.c  2004-05-26 00:11:40.000000000 +0200
@@ -1305,9 +1305,13 @@
 ****************************************************************************/
 void handle_map_info(int xsize, int ysize, int topology_id)
 {
+  map.size = 0; /* use server sended sizes */
+  map.ratio = 100;
+  map.topology_id = topology_id;
+  map_init_topology();
+
   map.xsize = xsize;
   map.ysize = ysize;
-  map.topology_id = topology_id;
 
   map_allocate();
   init_client_goto();
diff -ruN -Xfreeciv/diff_ignore freeciv/common/map.c freeciv_/common/map.c
--- freeciv/common/map.c        2004-05-21 10:54:00.000000000 +0200
+++ freeciv_/common/map.c       2004-05-26 12:11:40.000000000 +0200
@@ -176,9 +176,18 @@
 ***************************************************************/
 void map_init(void)
 {
-  map.topology_id = MAP_DEFAULT_TOPO;
-  map.xsize                 = MAP_DEFAULT_WIDTH;
-  map.ysize                 = MAP_DEFAULT_HEIGHT;
+  map.topology_id           = MAP_DEFAULT_TOPO;
+  map.size                  = MAP_DEFAULT_SIZE;
+  map.ratio                 = MAP_DEFAULT_RATIO;
+  /*
+    begin comment
+    To be set by map_init_topology(), begin with 0 teorical is ok but
+    I set it to some not zero value to fix a bug where
+    client execute advance_unit_focus befor server send sizes of the map!
+  */
+  map.xsize                 = MAX_LINEAR_SIZE;  
+  map.ysize                 = MAX_LINEAR_SIZE;
+  /*end comment                                               [mburda]*/
   map.seed                  = MAP_DEFAULT_SEED;
   map.riches                = MAP_DEFAULT_RICHES;
   map.huts                  = MAP_DEFAULT_HUTS;
@@ -200,6 +209,132 @@
   map.have_rivers_overlay   = FALSE;
   map.have_huts             = FALSE;
 }
+static int mcd(int A, int B) {
+ if ((A % 2) == 0 && (B % 2) == 0) {
+    return 2 * mcd( A / 2, B / 2);
+  }
+ if ((A % 3) == 0 && (B % 3) == 0) {
+    return 3 * mcd( A / 3, B / 3);
+  }
+ if ((A % 5) == 0 && (B % 5) == 0) {
+    return 5 * mcd( A / 5, B / 5);
+  }
+ if ((A % 7) == 0 && (B % 7) == 0) {
+    return 7 * mcd( A / 7, B / 7);
+  }
+ return 1;
+}
+
+/*
+ * This is the core of calculate size of the maps 
+ * final value are calculate to get defined ratios size in natural
+ * coordinated
+ * xsize and ysize are even numbers
+ * if iso-map ysize%4 == 0 to avoid any type of problems in
+ * extended topologies and iso-maps
+ */   
+static void setmapratio(double base_size, int Xratio, int Yratio)
+{
+  const int MCD = mcd(Xratio, Yratio);
+  /* if map.xsize and map.ysize are set from server  do nothing*/
+  if (base_size == 0) 
+    return;
+  /*
+   * Simplify the prime common divisor in ratios 
+   * ratios as 9:9 8:8 7:7 are converted to 1:1
+   */
+  Xratio /= MCD;
+  Yratio /= MCD;
+
+  /*
+   Correct exesives ratios
+  */
+  if( Xratio / Yratio >= 3) {
+    Xratio = 3;
+    Yratio = 1 ;
+    freelog(LOG_NORMAL,
+           "map.c: The ratios was raised to 31 \n"); 
+  }
+  if( Yratio / Xratio >= 3) {
+    Xratio = 1;
+    Yratio = 3 ;
+   freelog(LOG_NORMAL,
+           "map.c: The ratios was raised to 13 \n"); 
+  }
+
+  /* set corrected ratio in map.ratio if these values are set by user */
+  if( map.ratio != 100 ) {
+    map.ratio = 10 * Xratio + Yratio;
+    if(MCD != 1) {
+      freelog(LOG_NORMAL,
+        "map.c: The user defined ratios was corrected to %d \n", map.ratio);
+    }
+  }
+
+  /* in TF_ISO we need double map.ysize/map.ysize factor */ 
+  int iso = topo_has_flag(TF_ISO)? 2 : 1;
+  /* get a integer for the internal i_size var,this alow to make easly even 
numbers */
+  int i_size = floor(0.49 + sqrt(250.0 * base_size / (Xratio * Yratio * iso)));
+  /* verify for map.xsize and map.ysize estimated minimum value*/
+  /* this is make there to avoid a too complex code, but it is not exact */
+  int i_size_min = MIN(1, MAP_MIN_LINEAR_SIZE / MIN(Xratio, Yratio * iso) / 2);
+  if (i_size < i_size_min) { i_size = i_size_min; };
+  
+  /* set map.[xy]size as even numbers (and ysize %4 == 0 for TF_ISO)*/
+  map.xsize =       2 * Xratio * i_size;
+  map.ysize = iso * 2 * Yratio * i_size;
+
+  /* Verify up limit for map coordinates and correct it if needed */
+  if (MAX(MAP_WIDTH, MAP_HEIGHT) >= MAP_MAX_LINEAR_SIZE) {      /* make a more 
litle map if possible */
+    assert(base_size > 0.1);
+    setmapratio(base_size - 0.1, Xratio, Yratio);
+    return;
+  }
+  freelog(LOG_NORMAL,
+        "map.c: map.xsize and map.ysize are seted to %d and %d \n",
+         map.xsize, map.ysize);
+}
+
+/* auto-ratios can't change map.ratio */
+static void auto_ratio(int ratio)
+{
+  assert(ratio >= 11 && ratio < 100);
+  setmapratio(map.size, ratio / 10,(ratio % 10));
+}
+
+static void user_ratio(void)
+{
+  assert(map.ratio >= 11 && map.ratio <= 100);
+  if (map.ratio != 100)
+      setmapratio(map.size, map.ratio / 10,
+                  (map.ratio % 10));
+}
+
+#define INIT_TOPOLOGIE_CASE(TOPO,DEFAULTRATIO)                         \
+ case TOPO:                                                            \
+       if( map.ratio == 100){                                          \
+         auto_ratio(DEFAULTRATIO);                                     \
+       } else { user_ratio(); }                                        \
+       break;
+
+/*************************************************************************** 
+ map_init_topology() need to be called after changes on
+ map.topology_id, map.size and map.ratio was donned.
+ this calculate map.xsize and map.ysize
+
+ in client or when loading savegames map.size can be set to zero to
+ alow code to set direcly xsize and ysize 
+                                                                [mburda]
+*************************************************************************/
+void map_init_topology( void)
+{
+  switch (map.topology_id & (TF_WRAPX |TF_WRAPY)) {
+    INIT_TOPOLOGIE_CASE(0, AUTO_RATIO_FLAT);
+    INIT_TOPOLOGIE_CASE((TF_WRAPX |TF_WRAPY), AUTO_RATIO_TORUS);
+    INIT_TOPOLOGIE_CASE(TF_WRAPY, AUTO_RATIO_URANUS);
+    INIT_TOPOLOGIE_CASE(TF_WRAPX, AUTO_RATIO_CLASSIC);
+  };
+}
 
 /***************************************************************
 ...
diff -ruN -Xfreeciv/diff_ignore freeciv/common/map.h freeciv_/common/map.h
--- freeciv/common/map.h        2004-05-21 10:54:00.000000000 +0200
+++ freeciv_/common/map.h       2004-05-26 12:11:40.000000000 +0200
@@ -117,6 +117,7 @@
 
 struct civ_map { 
   int topology_id;
+  int size, ratio; /* used to calculate [xy]size */
   int xsize, ysize; /* native dimensions */
   int seed;
   int riches;
@@ -157,6 +158,8 @@
 
 #define topo_has_flag(flag) ((CURRENT_TOPOLOGY & (flag)) != 0)
 
+void map_init_topology(void );
+
 bool map_is_empty(void);
 void map_init(void);
 void map_allocate(void);
@@ -273,6 +276,14 @@
 (    (dest_x) = DIR_DX[(dir)],         \
      (dest_y) = DIR_DY[(dir)])
 
+#define MAP_WIDTH \
+   (topo_has_flag(TF_ISO) \
+    ? (map.xsize + map.ysize / 2) \
+    : map.xsize)
+#define MAP_HEIGHT \
+   (topo_has_flag(TF_ISO) \
+    ? (map.xsize + map.ysize / 2) \
+    : map.ysize)
 /*
  * Returns true if the step yields a new valid map position. If yes
  * (dest_x, dest_y) is set to the new map position.
@@ -637,13 +648,44 @@
 #define MAP_MIN_HUTS             0
 #define MAP_MAX_HUTS             500
 
-#define MAP_DEFAULT_WIDTH        80
-#define MAP_MIN_WIDTH            40
-#define MAP_MAX_WIDTH            200
-
-#define MAP_DEFAULT_HEIGHT       50
-#define MAP_MIN_HEIGHT           25
-#define MAP_MAX_HEIGHT           100
+/* size of the map in thusand of tiles */
+#define MAP_DEFAULT_SIZE         4
+#define MAP_MIN_SIZE             1
+#define MAP_MAX_SIZE             26
+
+/*
+ * This define the max linear size in map or native coordinates
+ * this must be liter than 255, this value is reserved for net usage
+ */
+#define MAP_MAX_LINEAR_SIZE      254
+#define MAP_MIN_LINEAR_SIZE      8
+
+/*
+ * This value determine the x:y ration of the map in NATURAL coordinated
+ * This ratio need to be corrected for NATIVE coordinated in
+ * iso-map by a factor sqrt(2) as (x / sqrt(2)) : (y * sqrt (2))
+ * the spetial values 100 is the AUTO RATIO (this is the prefered value)
+ */
+#define MAP_DEFAULT_RATIO         100
+#define MAP_MIN_RATIO             11
+#define MAP_MAX_RATIO             100
+
+/*
+ * The auto ratios for knowns topologies
+ * best if (but not needed)
+ * get RATIO factor = Xratio*Yratio as litle as posible
+ * this is best for litles map sizes                        
+ * get DEFAULT RATIO <= 2:1 or 1:2                              
+ */
+#define AUTO_RATIO_FLAT           11
+#define AUTO_RATIO_CLASSIC        85 
+#define AUTO_RATIO_URANUS         47 
+#define AUTO_RATIO_TORUS          11
+
+#define MAP_MIN_WIDTH            MAP_MIN_LINEAR_SIZE
+#define MAP_MAX_WIDTH            MAP_MAX_LINEAR_SIZE
+#define MAP_MIN_HEIGHT           MAP_MIN_LINEAR_SIZE
+#define MAP_MAX_HEIGHT           MAP_MAX_LINEAR_SIZE
 
 #define MAP_ORIGINAL_TOPO        TF_WRAPX
 #define MAP_DEFAULT_TOPO         TF_WRAPX
diff -ruN -Xfreeciv/diff_ignore freeciv/server/mapgen.c freeciv_/server/mapgen.c
--- freeciv/server/mapgen.c     2004-05-21 10:54:02.000000000 +0200
+++ freeciv_/server/mapgen.c    2004-05-26 12:11:40.000000000 +0200
@@ -1288,7 +1288,7 @@
 {
   /* save the current random state: */
   RANDOM_STATE rstate = get_myrand_state();
- 
+  
   if (map.seed==0)
     map.seed = (myrand(MAX_UINT32) ^ time(NULL)) & (MAX_UINT32 >> 1);
 
@@ -1303,7 +1303,8 @@
 
   /* don't generate tiles with mapgen==0 as we've loaded them from file */
   /* also, don't delete (the handcrafted!) tiny islands in a scenario */
-  if (map.generator != 0) {
+  if (map.generator != 0) { 
+    map_init_topology();/* initialize map.xsize and map.ysize, etc */
     map_allocate();
     adjust_terrain_param();
     /* if one mapgenerator fails, it will choose another mapgenerator */
diff -ruN -Xfreeciv/diff_ignore freeciv/server/savegame.c 
freeciv_/server/savegame.c
--- freeciv/server/savegame.c   2004-05-24 11:43:17.000000000 +0200
+++ freeciv_/server/savegame.c  2004-05-26 00:11:40.000000000 +0200
@@ -343,8 +343,11 @@
 ***************************************************************/
 static void map_tiles_load(struct section_file *file)
 {
+  map.size = 0; /* use xize/ysize from load */
+  map.ratio= 100;
   map.topology_id = secfile_lookup_int_default(file, MAP_ORIGINAL_TOPO,
                                               "map.topology_id");
+  map_init_topology(); /* this call never change [xy]size */
 
   /* In some cases we read these before, but not always, and
    * its safe to read them again:
diff -ruN -Xfreeciv/diff_ignore freeciv/server/stdinhand.c 
freeciv_/server/stdinhand.c
--- freeciv/server/stdinhand.c  2004-05-25 11:38:43.000000000 +0200
+++ freeciv_/server/stdinhand.c 2004-05-26 11:28:22.000000000 +0200
@@ -254,28 +254,42 @@
   /* These should be grouped by sclass */
   
 /* Map size parameters: adjustable if we don't yet have a map */  
-  GEN_INT("xsize", map.xsize, SSET_MAP_SIZE, SSET_GEOLOGY, SSET_TO_CLIENT,
-         N_("Map width in squares"), "", NULL,
-         MAP_MIN_WIDTH, MAP_MAX_WIDTH, MAP_DEFAULT_WIDTH)
-    
-  GEN_INT("ysize", map.ysize, SSET_MAP_SIZE, SSET_GEOLOGY, SSET_TO_CLIENT,
-         N_("Map height in squares"), "", NULL,
-         MAP_MIN_HEIGHT, MAP_MAX_HEIGHT, MAP_DEFAULT_HEIGHT)
-
+  GEN_INT("size", map.size, SSET_MAP_SIZE, SSET_GEOLOGY, SSET_TO_CLIENT,
+          N_("Map size in 1,000 tiles units"),
+          N_("This value is used to determine xsize and ysize\n"
+             " size = 4 is a litle map of  4,000 tiles (default)\n"
+             " size = 20 is a Huge map of 20,000 tiles \n"
+            "The maximal size is limited by topology and ratio\n"
+            "See the topologie help. the real size auto reised\n"
+            "to these maximals"), NULL,
+          MAP_MIN_SIZE,MAP_MAX_SIZE , MAP_DEFAULT_SIZE)
+
+   GEN_INT("ratio", map.ratio, SSET_MAP_SIZE, SSET_INTERNAL, SSET_TO_CLIENT,
+          N_("Map ratio, keep it default value of 100 (auto)\n"),
+          N_("This value is used to determine xsize and ysize \n"
+            " 100 is the default ratio determined by the topology_id\n"
+            "Otherwise first digit is the x factor \n"
+            "and second digit the y factor of the x:y ratio \n"
+             " 11 is 1:1 ratio, 85 is a 8:5 ratio. \n"
+            "Extreme ratio (more than 3/1) are auto raised to these limit \n"
+            "Change it at your own risk, bad ratios limit size of map!"
+             ), NULL,
+          MAP_MIN_RATIO, MAP_MAX_RATIO , MAP_DEFAULT_RATIO)
   GEN_INT("topology", map.topology_id, SSET_MAP_SIZE, SSET_GEOLOGY, 
           SSET_TO_CLIENT,
          N_("The map topology index"),
          N_("Two-dimensional maps can wrap at the north-south or \n"
             "east-west edges, and use a cartesian or isometric \n"
             "rectangular grid.  See the manual for further explanation.\n"
-             "  0 Flat Earth (unwrapped)\n"
-             "  1 Earth (wraps E-W)\n"
-             "  2 Uranus (wraps N-S)\n"
-             "  3 Donut World (wraps N-S, E-W)\n"
-            "  4 Flat Earth (isometric)\n"
-            "  5 Earth (isometric)\n"
-            "  6 Uranus (isometric)\n"
-            "  7 Donut World (isometric)"
+             "  0 Flat Earth (unwrapped)      [64]\n"
+             "  1 Earth (wraps E-W)           [40]\n"
+             "  2 Uranus (wraps N-S)          [36]\n"
+             "  3 Donut World (wraps N-S, E-W)[64]\n"
+            "  4 Flat Earth (isometric)      [14]\n"
+            "  5 Earth (isometric)           [26]\n"
+            "  6 Uranus (isometric)          [11]\n"
+            "  7 Donut World (isometric)     [14]\n"
+            " [] the maximal size are calculated for auto ratio"
           ), NULL, 
          MAP_MIN_TOPO, MAP_MAX_TOPO, MAP_DEFAULT_TOPO)
 
diff -ruN -Xfreeciv/diff_ignore freeciv/test.log freeciv_/test.log
--- freeciv/test.log    1970-01-01 01:00:00.000000000 +0100
+++ freeciv_/test.log   2004-05-26 11:48:28.000000000 +0200
@@ -0,0 +1,8 @@
+2: Accepte dorénavant la connexion de nouveaux clients.
+2: Connexion demandée par mburda depuis localhost
+2: c1 a un client en version 1.14.99-devel
+2: mburda has connected from localhost.
+2: Chargement des règles
+2: map.c: map.xsize and map.ysize are seted to 80 and 50 
+
+2: Connexion perdue: mburda de localhost(joueur Vaclav Havel).