[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[pepeto]

Update of bug #15255 (project freeciv):

  Status:  Ready For Test => Fixed  
 Open/Closed:Open => Closed 


___

Reply to this item at:

  

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Follow-up Comment #16, bug #15255 (project freeciv):

I have one little addition to the patch:

prevent jungles in case of swamp selection in make_terrains(); no jungles
near the poles in TT_TEMPERATE.


  PLACE_ONE_TYPE(swamps_count, forests_count,
-pick_terrain(MG_WET, MG_LAST, MG_DRY),
+pick_terrain(MG_WET, MG_LAST, MG_FOLIAGE),
 WC_NDRY, TT_HOT, MC_LOW, 50);


updated patch attached

(file #7988, file #7989)
___

Additional Item Attachment:

File name: trunk_generator3.patch Size:25 KB
File name: S2_2_generator3.patch  Size:25 KB


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Follow-up Comment #15, bug #15255 (project freeciv):

sorry if it was not clear - it is OK for committing. The things listed are
only the results of testing lot of freeciv maps. If there will be a patch, it
is of low priority and only a cosmetic change.

___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[pepeto]

Follow-up Comment #14, bug #15255 (project freeciv):

So what is your conclusion? Ok for committing, or need again to be improved?


___

Reply to this item at:

  

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Follow-up Comment #13, bug #15255 (project freeciv):

> Will compile the patch now and then test some maps ... 

I tested the patch and if swamps are allowed in !FROZEN terrains they look
fine for the different generators and temperature settings of 30 / 50 / 70
(swamp explanation in bug #15001).

One thing with regard to poles (map with temperature = 30; size = 5; topology
= 3):


3: map settings:
3:   mountain_pct :   18%
3:   desert_pct   :4%
3:   forest_pct   :   18%
3:   jungle_pct   :0%
3:   swamp_pct:5%
3: map statistics:
3:   Lake :   22   0.4% (ocean:   0.9%)
3:   Ocean: 1408  28.7% (ocean:  56.1%)
3:   Deep Ocean   : 1079  22.0% (ocean:  43.0%)
3:   Glacier  : 1163  23.7% (land:   48.6%)
3:   Desert   :   46   0.9% (land:1.9%)
3:   Forest   :  220   4.5% (land:9.2%)
3:   Grassland:  336   6.9% (land:   14.1%)
3:   Hills:  139   2.8% (land:5.8%)
3:   Jungle   :4   0.1% (land:0.2%)
3:   Mountains:   83   1.7% (land:3.5%)
3:   Plains   :  335   6.8% (land:   14.0%)
3:   Swamp:   61   1.2% (land:2.6%)
3:   Tundra   :4   0.1% (land:0.2%)


In the above output the map settings and the map statistic don't match. One
has to take into account that the poles (= glacier) are special and are set
after water (lake + ocean + deep ocean) but before the land tiles are
defined. One has to remove this terrain type to get the right numbers (i.e
for forest: 9.2 * 100 / (100-48.6) = 17.9). For a high temperature map
(temperature = 70; size = 5; topology = 3) it looks (kind of) OK:


3: map settings:
3:   mountain_pct :   20%
3:   desert_pct   :9%
3:   forest_pct   :   15%
3:   jungle_pct   :5%
3:   swamp_pct:8%
3: map statistics:
3:   Lake :   13   0.3% (ocean:   0.3%)
3:   Ocean: 1052  21.5% (ocean:  28.3%)
3:   Deep Ocean   : 2655  54.2% (ocean:  71.4%)
3:   Glacier  :0   0.0% (land:0.0%)
3:   Desert   :   46   0.9% (land:3.9%)
3:   Forest   :  160   3.3% (land:   13.6%)
3:   Grassland:  315   6.4% (land:   26.7%)
3:   Hills:  145   3.0% (land:   12.3%)
3:   Jungle   :   18   0.4% (land:1.5%)
3:   Mountains:   93   1.9% (land:7.9%)
3:   Plains   :  308   6.3% (land:   26.1%)
3:   Swamp:   95   1.9% (land:8.1%)
3:   Tundra   :0   0.0% (land:0.0%)


This also differs for different topology settings (all generators); wrap N-S
+ wrap E-W maps (topology = 3,7,11,15) have for temperature = 30 around 23%
glacier at the poles while the other topologies have only around 11%.

(only some statistics I found while experimenting with the map settings)

___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[pepeto]

Follow-up Comment #12, bug #15255 (project freeciv):

> could you please change the following copy & paste error

Done.

> I forgot to break the lines after 78 characters, sorry!

Normally, the maximal number of characters is 77 per line.  If we wouldn't
make mistakes, we wouldn't be human!

(file #7983, file #7984)
___

Additional Item Attachment:

File name: trunk_generator2.diff  Size:25 KB
File name: S2_2_generator.diffSize:25 KB


___

Reply to this item at:

  

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Follow-up Comment #11, bug #15255 (project freeciv):

nitpicking on my own comments in the code:

* could you please change the following copy & paste error (line 1309):


-  /* initialise terrain selection lists used by make_island() */
+  /* free terrain selection lists used by make_island() */



___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Follow-up Comment #10, bug #15255 (project freeciv):

The patch looks good! I think it will also solves bug #15001. Will compile
the patch now and then test some maps ...

I forgot to break the lines after 78 characters, sorry!


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[pepeto]

Follow-up Comment #9, bug #15255 (project freeciv):

> Do you have a patch file?

lol, I forgot to attach it.


(file #7977)
___

Additional Item Attachment:

File name: trunk_generator.diff   Size:25 KB


___

Reply to this item at:

  

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Follow-up Comment #8, bug #15255 (project freeciv):

Do you have a patch file?

___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[pepeto]

Update of bug #15255 (project freeciv):

  Status:   Postponed => Ready For Test 

___

Follow-up Comment #7:

Improved version for trunk: (full patch, does not depend of bug# 15001)
* Really create swamp terrains.
* Improve generator 1 & 2.
* Improve how _wetness_ is taken in account.

If all looks right, I can do a version for 2.2.


___

Reply to this item at:

  

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Update of bug #15255 (project freeciv):

  Depends on: => bugs #15001


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Follow-up Comment #6, bug #15255 (project freeciv):

updated patch:

update make_island() - generator 3

* complete rework of the function make_island()
* definition of the terrain_selection within its own function
(island_terrain_init())
* update print_mapgen_map() to print more information

(file #7972)
___

Additional Item Attachment:

File name: 20100206-trunk-update-make_island-generator-3.patch Size:20 KB


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[pepeto]

Follow-up Comment #5, bug #15255 (project freeciv):

> you moved pick_terrain() into the while loop of fill_island()?
> this way it will be called in each loop.

Precisely to be called each loop and don't fill an island with a very few
types.  If a ruleset contains tons of terrain types, then the user would be
sad if only a very few are used in the map generation.

> you use tmap_is() and test_wetness() instead of the colatitude?
> As the temperate map is created as a dummy tmap it is equal to
> the colattitude.

Both tmap_is() and test_wetness() use the colattitude information.  But they
also allow to ignore the colattitude or check if there is ocean types
arround.


___

Reply to this item at:

  

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Follow-up Comment #4, bug #15255 (project freeciv):

> Could you try to improve this patch yourself? 

I will work on this patch. Could you tell me the reason why:

* you moved pick_terrain() into the while loop of fill_island()? this way it
will be called in each loop.
* you use tmap_is() and test_wetness() instead of the colatitude? As the
temperate map is created as a dummy tmap it is equal to the colattitude.


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[pepeto]

Update of bug #15255 (project freeciv):

  Status:  Ready For Test => Postponed  

___

Follow-up Comment #3:

Could you try to improve this patch yourself?


___

Reply to this item at:

  

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

Follow-up Comment #2, bug #15255 (project freeciv):

there still are swamps and jungels near the poles

I used the server script temperature.serv (attached). The server was started
with


./ser -r temperature -d 4:mapgen.c


an example result can be seen in map_generator_3.jpg

Furthermore there is nearly no forest:


4: Lake :0 0%
4:Ocean :  680 71%
4:   Deep Ocean :  301 31%
4:  Glacier :  463 48%
4:   Desert :   19 2%
4:   Forest :   28 2%
4:Grassland :  140 14%
4:Hills :   63 6%
4:   Jungle :   51 5%
4:Mountains :   23 2%
4:   Plains :  143 15%
4:Swamp :   21 2%
4:   Tundra :4 0%


There is also a long list of dropped requirements like the following:


4: pick_terrain(target: MG_WET, [dropping prefer: MG_TROPICAL], avoid:
MG_FOLIAGE)
4: pick_terrain(target: MG_WET, prefer: MG_LAST, [dropping avoid:
MG_FOLIAGE])



(file #7957, file #7958)
___

Additional Item Attachment:

File name: temperature.serv   Size:0 KB
File name: map_generator_3.jpgSize:253 KB


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[pepeto]

Update of bug #15255 (project freeciv):

  Status:None => Ready For Test 
 Assigned to:None => pepeto 

___

Follow-up Comment #1:

Big improvements attached.


(file #7955)
___

Additional Item Attachment:

File name: trunk_S2_2_generator_pick_terrain.diff Size:9 KB


___

Reply to this item at:

  

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #15255] update make_island() - generator 3

[Matthias Pfafferodt]

URL:
  

 Summary: update make_island() - generator 3
 Project: Freeciv
Submitted by: syntron
Submitted on: Sonntag 31.01.2010 um 23:22
Category: general
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 2.2.0

___

Details:

bug #15001 solved the problem of generating jungles and swamps near the poles
for generator 1 & 2. This patch tries to solve the problem for generator 3. It
does this by updating fill_island() to consider tropic, medium and cold
temperature zones.

It generates maps which are OK but have a little bit less forests ...



___

File Attachments:


---
Date: Sonntag 31.01.2010 um 23:22  Name:
0004-update-make_island-generator-3.patch  Size: 12kB   By: syntron



___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev