バイナリ地名・地物データの読み込み対応＆A*アルゴリズムと集落移動描画の改良＆フロー曲線と領域線の色入力対応

Data/Locales/Simulation/Models/en-US.tsv

@@ -1,6 +1,7 @@
 key	value
 Sample	Select a model
 EpiJomon	AynuMosir2
+WesternYaponesia	Western Japan
 Yaponesia	Yayoi (Japan)
 AynuMosir	AynuMosir
 Philippines	Philippines

Data/Locales/Simulation/Models/ja-JP.tsv

@@ -1,6 +1,7 @@
 key	value
 Sample	項目からモデルを選択
 EpiJomon	続縄文時代：北海道
+WesternYaponesia	西日本
 Yaponesia	弥生時代：本州～九州
 AynuMosir	擦文時代：北海道
 Philippines	フィリピン

Data/PlaceNames/Europe/README.md

@@ -0,0 +1,5 @@
+# License
+
+[Itiner-e: the digital atlas of ancient roads](https://itiner-e.org/) © 2024 by Brughmans, Pažout, de Soto and Bjerregaard Vahlstrup is licensed under [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/)
+
+Brughmans, T., de Soto, P., Pažout, A. and Bjerregaard Vahlstrup, P. (2024) Itiner-e: the digital atlas of ancient roads. https://itiner-e.org

Data/Settings/FlowCurves.tsv

@@ -1,5 +1,5 @@
 key	file_path	type	description	min_size	max_size	first_year	last_year	color	line_width
-Test1	Data/FlowCurves/Kuroshio.tsv	view_flow_curve	黒潮	0	200	-2500	1500	black	55.5
-Test2	Data/FlowCurves/Tsushima.tsv	view_flow_curve	対馬海流	0	200	-2500	1500	black	55.5
-Test3	Data/FlowCurves/EastKorea.tsv	view_flow_curve	東朝鮮暖流	0	200	-2500	1500	black	55.5
-Test4	Data/FlowCurves/GulfStream.tsv	view_flow_curve	メキシコ湾流	0	200	-2500	1500	black	55.5
+Test1	Data/FlowCurves/Kuroshio.tsv	view_flow_curve	黒潮	0	200	-2500	1500	#3C6491	6
+Test2	Data/FlowCurves/Tsushima.tsv	view_flow_curve	対馬海流	0	200	-2500	1500	#5B88BC	4
+Test3	Data/FlowCurves/EastKorea.tsv	view_flow_curve	東朝鮮暖流	0	200	-2500	1500	#5B88BC	2
+Test4	Data/FlowCurves/GulfStream.tsv	view_flow_curve	メキシコ湾流	0	200	-2500	1500	#5B88BC	6

Data/Settings/PlaceNames.tsv

@@ -1,16 +1,16 @@
 key	file_path	type	description	min_size	max_size	first_julian_day	last_julian_day	texture	zoom
 Kojiki	Data/PlaceNames/EastAsia/Yaponesia/KojikiPlaceName.tsv	ancient_text	古事記の地名	0	2	1721424	1940208		1
 SamgukSagi	Data/PlaceNames/EastAsia/Korea/SamgukSagi.tsv	ancient_text	三国史記	0.1	100				1
-Wamyo	Data/PlaceNames/EastAsia/Yaponesia/WamyoRuijushoPlaceName.tsv	ancient_text	倭名類聚抄の地名	0	0.4	1721424	9999999		1
+Wamyo	Data/PlaceNames/EastAsia/Yaponesia/WamyoRuijushoPlaceName.bin	ancient_text	倭名類聚抄の地名	0	0.4	1721424	9999999		1
 Omoro	Data/PlaceNames/EastAsia/Yaponesia/OmoroSoshiPlaceName.tsv	ancient_text	おもろさうしの地名	0	1	1721424	9999999		1
 Ryoseikoku	Data/PlaceNames/EastAsia/Yaponesia/Ryoseikoku.tsv	administrative	令制国名	1	100				1
-WamyoKori	Data/PlaceNames/EastAsia/Yaponesia/WamyoRuijushoKori.tsv	administrative	倭名類聚抄の郡	0.4	20	1721424			1
+WamyoKori	Data/PlaceNames/EastAsia/Yaponesia/WamyoRuijushoKori.bin	administrative	倭名類聚抄の郡	0.4	20	1721424			1
 TAinu	Data/PlaceNames/EastAsia/Yaponesia/TohokuAinu.tsv	indigenous	東北アイヌ	1	4	1721424	9999999		1
 HAinu	Data/PlaceNames/EastAsia/Yaponesia/HokkaidoAinu.tsv	indigenous	北海道アイヌ	1	4	1721424	9999999		1
 SAinu	Data/PlaceNames/EastAsia/Yaponesia/SakhalinAinu.tsv	indigenous	サハリンアイヌ	1	4	1721424	9999999		1
 KAinu	Data/PlaceNames/EastAsia/Siberia/KamchatkaAinu.tsv	indigenous	カムサスカアイヌ	1	64	1721424	9999999		1
 Balhae	Data/PlaceNames/EastAsia/Manchuria/Balhae.tsv	historical_state	渤海国	1	100	1976003	2059279		1
-Roma	Data/PlaceNames/Europe/Roma.tsv	historical_state	ローマ帝国	1	200		9999999		1
+Roma	Data/PlaceNames/Europe/Roma.bin	historical_state	ローマ帝国	1	4		9999999		1
 PlaceNames	Data/PlaceNames/PlaceNames.tsv	general	汎用的な地名		200				1
 China	Data/PlaceNames/EastAsia/China/China.tsv	general	中国大陸の地名	0.1	24	0	9999999		1
-NRCT	Data/PlaceNames/EastAsia/Yaponesia/Geoshape/NRCT.tsv	general	『日本歴史地名大系』地名項目データセット	0	0.1	1721424	9999999		1
+NRCT	Data/PlaceNames/EastAsia/Yaponesia/Geoshape/NRCT.bin	general	『日本歴史地名大系』地名項目データセット	0	0.1	1721424	9999999		1

Data/Settings/Territories.tsv

@@ -1,6 +1,6 @@
 key	file_path	type	description	min_size	max_size	first_year	last_year	color	line_width
-Territories1	Data/Territories/Sakishima/Shimotabaru.tsv	view_territory	下田原文化	0	100	-2500	-1500	black	55.5
-Territories2	Data/Territories/Sakishima/Mudoki.tsv	view_territory	先島無土器文化	0	100	-200	1200	black	55.5
-Territories3	Data/Territories/Ryukyu/Kaizuka.tsv	view_territory	沖縄貝塚文化	0	100	-4400	1200	black	55.5
-Territories4	Data/Territories/Lapita.tsv	view_territory	ラピタ文化	0	100	-1600	-500	black	55.5
-Territories4	Data/Territories/Afanasievo.tsv	view_territory	???	0	200	-3300	-2500	black	55.5
+Territories1	Data/Territories/Sakishima/Shimotabaru.tsv	view_territory	下田原文化	0	100	-2500	-1500	#888888	55.5
+Territories2	Data/Territories/Sakishima/Mudoki.tsv	view_territory	先島無土器文化	0	100	-200	1200	#888888	55.5
+Territories3	Data/Territories/Ryukyu/Kaizuka.tsv	view_territory	沖縄貝塚文化	0	100	-4400	1200	#888888	55.5
+Territories4	Data/Territories/Lapita.tsv	view_territory	ラピタ文化	0	100	-1600	-500	#888888	55.5
+Territories4	Data/Territories/Afanasievo.tsv	view_territory	???	0	200	-3300	-2500	#888888	55.5

Data/Simulations/Area.tsv

@@ -11,4 +11,5 @@ Yaponesia	853	326	973	448	10
 AynuMosir	908	347	936	383	10
 AynuMosir2	908	326	929	383	10
 Philippines	840	432	880	504	10
-Aotearoa	976	608	1024	672	10
+Aotearoa	976	608	1024	672	10
+WesternJapan	877	396	903	421	10

Data/Simulations/EpiJomon/Settings.tsv

@@ -42,7 +42,7 @@ land_cost	2.5	傾斜度0度の陸上の通行コスト
 move_redo	10	移動再試行回数
 move_method	astar	移動の手法(astar/random)
 move_astar_loop	8	A*を行うルート数
-move_astar_distance	128	A*を行うルート間隔
+move_astar_distance	32	A*を行うルート間隔
 #File --------------------	#ファイル	--------------------------------------------------
 marriage_file	Marriage.tsv	年別婚姻率
 childbearing_file	Childbearing.tsv	年別出産率

Data/Simulations/Models.txt

@@ -1,6 +1,7 @@
 Sample
 EpiJomon
+WesternYaponesia
+Philippines
 Yaponesia
 AynuMosir
-Philippines
 Aotearoa

Data/Simulations/WesternYaponesia/Childbearing.tsv

@@ -0,0 +1,102 @@
+age	hunter_gatherer	agricultural
+0	0	0
+1	0	0
+2	0	0
+3	0	0
+4	0	0
+5	0	0
+6	0	0
+7	0	0
+8	0	0
+9	0	0
+10	0	0
+11	0	0
+12	0	0
+13	0	0
+14	0.009022766008	0.003007588669
+15	0.03746975846	0.01248991949
+16	0.06757353696	0.02252451232
+17	0.09958830351	0.03319610117
+18	0.1337557159	0.04458523864
+19	0.1703668704	0.05678895681
+20	0.2098868832	0.0699622944
+21	0.2526807842	0.08422692807
+22	0.2995459554	0.09984865178
+23	0.3511586331	0.1170528777
+24	0.4089346823	0.1363115608
+25	0.4743033249	0.1581011083
+26	0.5500259893	0.1833419964
+27	0.6405890518	0.2135296839
+28	0.7534403528	0.2511467843
+29	0.9056625696	0.3018875232
+30	1.151236496	0.3837454986
+31	1.312976024	0.4376586748
+32	1.087701736	0.3625672452
+33	0.8668848806	0.2889616269
+34	0.7222288212	0.2407429404
+35	0.6129487486	0.2043162495
+36	0.5239938899	0.17466463
+37	0.4484244189	0.1494748063
+38	0.3825212912	0.1275070971
+39	0.3241175852	0.1080391951
+40	0.2715395289	0.09051317629
+41	0.2237504232	0.07458347441
+42	0.1799112904	0.05997043012
+43	0.139559001	0.046519667
+44	0.1021741604	0.03405805348
+45	0.06747719441	0.02249239814
+46	0.03521142259	0.01173714086
+47	0.005148315889	0.001716105296
+48	0	0
+49	0	0
+50	0	0
+51	0	0
+52	0	0
+53	0	0
+54	0	0
+55	0	0
+56	0	0
+57	0	0
+58	0	0
+59	0	0
+60	0	0
+61	0	0
+62	0	0
+63	0	0
+64	0	0
+65	0	0
+66	0	0
+67	0	0
+68	0	0
+69	0	0
+70	0	0
+71	0	0
+72	0	0
+73	0	0
+74	0	0
+75	0	0
+76	0	0
+77	0	0
+78	0	0
+79	0	0
+80	0	0
+81	0	0
+82	0	0
+83	0	0
+84	0	0
+85	0	0
+86	0	0
+87	0	0
+88	0	0
+89	0	0
+90	0	0
+91	0	0
+92	0	0
+93	0	0
+94	0	0
+95	0	0
+96	0	0
+97	0	0
+98	0	0
+99	0	0
+100	0	0

Data/Simulations/WesternYaponesia/ChildbearingCMR45.tsv

@@ -0,0 +1,101 @@
+age	hunter_gatherer	agricultural
+1	0.00000	0.00000
+2	0.00000	0.00000
+3	0.00000	0.00000
+4	0.00000	0.00000
+5	0.00000	0.00000
+6	0.00000	0.00000
+7	0.00000	0.00000
+8	0.00000	0.00000
+9	0.00000	0.00000
+10	0.00000	0.00000
+11	0.00000	0.00000
+12	0.00000	0.00000
+13	0.00000	0.00000
+14	0.00000	0.00000
+15	0.01086	0.01090
+16	0.01086	0.01090
+17	0.01086	0.01090
+18	0.01086	0.01090
+19	0.01086	0.01090
+20	0.02480	0.02490
+21	0.02480	0.02490
+22	0.02480	0.02490
+23	0.02480	0.02490
+24	0.02480	0.02490
+25	0.02604	0.02615
+26	0.02604	0.02615
+27	0.02604	0.02615
+28	0.02604	0.02615
+29	0.02604	0.02615
+30	0.02045	0.02053
+31	0.02045	0.02053
+32	0.02045	0.02053
+33	0.02045	0.02053
+34	0.02045	0.02053
+35	0.01464	0.01469
+36	0.01464	0.01469
+37	0.01464	0.01469
+38	0.01464	0.01469
+39	0.01464	0.01469
+40	0.00601	0.00604
+41	0.00601	0.00604
+42	0.00601	0.00604
+43	0.00601	0.00604
+44	0.00601	0.00604
+45	0.00151	0.00152
+46	0.00151	0.00152
+47	0.00151	0.00152
+48	0.00151	0.00152
+49	0.00151	0.00152
+50	0.00151	0.00152
+51	0.00000	0.00000
+52	0.00000	0.00000
+53	0.00000	0.00000
+54	0.00000	0.00000
+55	0.00000	0.00000
+56	0.00000	0.00000
+57	0.00000	0.00000
+58	0.00000	0.00000
+59	0.00000	0.00000
+60	0.00000	0.00000
+61	0.00000	0.00000
+62	0.00000	0.00000
+63	0.00000	0.00000
+64	0.00000	0.00000
+65	0.00000	0.00000
+66	0.00000	0.00000
+67	0.00000	0.00000
+68	0.00000	0.00000
+69	0.00000	0.00000
+70	0.00000	0.00000
+71	0.00000	0.00000
+72	0.00000	0.00000
+73	0.00000	0.00000
+74	0.00000	0.00000
+75	0.00000	0.00000
+76	0.00000	0.00000
+77	0.00000	0.00000
+78	0.00000	0.00000
+79	0.00000	0.00000
+80	0.00000	0.00000
+81	0.00000	0.00000
+82	0.00000	0.00000
+83	0.00000	0.00000
+84	0.00000	0.00000
+85	0.00000	0.00000
+86	0.00000	0.00000
+87	0.00000	0.00000
+88	0.00000	0.00000
+89	0.00000	0.00000
+90	0.00000	0.00000
+91	0.00000	0.00000
+92	0.00000	0.00000
+93	0.00000	0.00000
+94	0.00000	0.00000
+95	0.00000	0.00000
+96	0.00000	0.00000
+97	0.00000	0.00000
+98	0.00000	0.00000
+99	0.00000	0.00000
+100	0.00000	0.00000