Skip to content

Commit 46d9bcc

Browse files
nicolaspayettenicolaspayette
committed
use LAJOLLA palette for biomass maps in example
1 parent 19c2636 commit 46d9bcc

File tree

4 files changed

+261
-4
lines changed

4 files changed

+261
-4
lines changed

‎examples/src/main/java/uk/ac/ox/poseidon/examples/BasicScenarioWithUI.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ public BasicScenarioWithUI(final BasicScenario scenario) {
3838
),
3939
"Species A Biomass",
4040
new NumberGridWithCapacityPortrayalFactory(
41-
TURKU,
41+
LAJOLLA,
4242
"Biomass",
4343
false,
4444
scenario.getBiomassGridA(),
4545
scenario.getCarryingCapacityGrid()
4646
),
4747
"Species B Biomass",
4848
new NumberGridWithCapacityPortrayalFactory(
49-
TURKU,
49+
LAJOLLA,
5050
"Biomass",
5151
false,
5252
scenario.getBiomassGridB(),

‎gui/src/main/java/uk/ac/ox/poseidon/gui/palettes/PaletteColorMap.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
public class PaletteColorMap extends AbstractColorMap {
1818

1919
public static final String IMOLA = "imola";
20+
public static final String LAJOLLA = "lajolla";
2021
public static final String OLERON = "oleron";
2122
public static final String TURKU = "turku";
2223
private static final Color TRANSPARENT = new Color(0, 0, 0, 0);

‎gui/src/main/java/uk/ac/ox/poseidon/gui/portrayals/VesselFieldPortrayalFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import uk.ac.ox.poseidon.core.Simulation;
3232
import uk.ac.ox.poseidon.core.SimulationScopeFactory;
3333

34-
import static java.awt.Color.BLACK;
34+
import static java.awt.Color.*;
3535
import static sim.portrayal.simple.OrientedPortrayal2D.SHAPE_COMPASS;
3636

3737
@Getter
@@ -52,7 +52,7 @@ protected ContinuousPortrayal2D newInstance(final Simulation simulation) {
5252
new SimplePortrayal2D(),
5353
0,
5454
SCALE,
55-
BLACK,
55+
WHITE,
5656
SHAPE_COMPASS
5757
)
5858
);

‎gui/src/main/resources/palettes/lajolla.txt

+256
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,256 @@
1+
0.098791 0.099669 0.000088
2+
0.102398 0.100814 0.002016
3+
0.105856 0.102014 0.003932
4+
0.109170 0.103273 0.005840
5+
0.112474 0.104439 0.007746
6+
0.115773 0.105695 0.009656
7+
0.119086 0.106937 0.011760
8+
0.122370 0.108079 0.013670
9+
0.125765 0.109344 0.015595
10+
0.129083 0.110536 0.017532
11+
0.132479 0.111731 0.019486
12+
0.135832 0.112947 0.021462
13+
0.139249 0.114096 0.023462
14+
0.142721 0.115314 0.025492
15+
0.146188 0.116556 0.027555
16+
0.149714 0.117765 0.029655
17+
0.153215 0.119010 0.031796
18+
0.156820 0.120223 0.033961
19+
0.160419 0.121466 0.036412
20+
0.164141 0.122736 0.038709
21+
0.167834 0.124034 0.041058
22+
0.171613 0.125365 0.043253
23+
0.175448 0.126668 0.045600
24+
0.179347 0.128031 0.047889
25+
0.183292 0.129370 0.050218
26+
0.187338 0.130777 0.052456
27+
0.191398 0.132157 0.054749
28+
0.195552 0.133574 0.057052
29+
0.199759 0.135025 0.059373
30+
0.204093 0.136445 0.061524
31+
0.208438 0.137979 0.063852
32+
0.212867 0.139428 0.066100
33+
0.217399 0.141015 0.068401
34+
0.221979 0.142548 0.070615
35+
0.226668 0.144129 0.072894
36+
0.231424 0.145750 0.075110
37+
0.236255 0.147356 0.077324
38+
0.241152 0.148993 0.079626
39+
0.246126 0.150675 0.082053
40+
0.251203 0.152365 0.084452
41+
0.256313 0.154101 0.086925
42+
0.261529 0.155889 0.089444
43+
0.266808 0.157647 0.092067
44+
0.272159 0.159456 0.094750
45+
0.277620 0.161336 0.097443
46+
0.283142 0.163196 0.100219
47+
0.288738 0.165057 0.103107
48+
0.294406 0.167020 0.106026
49+
0.300173 0.168975 0.108981
50+
0.306035 0.170932 0.112027
51+
0.311930 0.172936 0.115071
52+
0.317951 0.174991 0.118267
53+
0.324033 0.177046 0.121403
54+
0.330210 0.179135 0.124669
55+
0.336449 0.181231 0.127997
56+
0.342792 0.183380 0.131345
57+
0.349191 0.185585 0.134755
58+
0.355681 0.187779 0.138191
59+
0.362234 0.189962 0.141663
60+
0.368872 0.192199 0.145203
61+
0.375570 0.194487 0.148714
62+
0.382348 0.196763 0.152311
63+
0.389208 0.199025 0.155973
64+
0.396126 0.201339 0.159588
65+
0.403111 0.203702 0.163305
66+
0.410167 0.206055 0.167007
67+
0.417279 0.208396 0.170707
68+
0.424448 0.210766 0.174453
69+
0.431694 0.213130 0.178213
70+
0.438972 0.215530 0.181919
71+
0.446327 0.217923 0.185715
72+
0.453734 0.220327 0.189437
73+
0.461197 0.222709 0.193178
74+
0.468712 0.225073 0.196918
75+
0.476277 0.227476 0.200586
76+
0.483887 0.229823 0.204310
77+
0.491568 0.232214 0.207943
78+
0.499268 0.234569 0.211570
79+
0.507032 0.236904 0.215121
80+
0.514841 0.239198 0.218665
81+
0.522691 0.241494 0.222129
82+
0.530585 0.243739 0.225557
83+
0.538526 0.245982 0.228915
84+
0.546498 0.248220 0.232200
85+
0.554505 0.250369 0.235417
86+
0.562556 0.252534 0.238525
87+
0.570622 0.254658 0.241596
88+
0.578732 0.256723 0.244541
89+
0.586863 0.258774 0.247442
90+
0.595019 0.260780 0.250209
91+
0.603195 0.262762 0.252927
92+
0.611383 0.264701 0.255529
93+
0.619582 0.266626 0.258022
94+
0.627779 0.268526 0.260449
95+
0.635979 0.270408 0.262772
96+
0.644165 0.272236 0.264987
97+
0.652346 0.274100 0.267119
98+
0.660500 0.275957 0.269192
99+
0.668632 0.277791 0.271140
100+
0.676724 0.279653 0.273014
101+
0.684764 0.281520 0.274801
102+
0.692762 0.283434 0.276532
103+
0.700683 0.285371 0.278167
104+
0.708537 0.287376 0.279741
105+
0.716305 0.289458 0.281228
106+
0.723970 0.291602 0.282691
107+
0.731535 0.293812 0.284053
108+
0.738987 0.296143 0.285370
109+
0.746299 0.298576 0.286641
110+
0.753474 0.301124 0.287867
111+
0.760502 0.303810 0.289058
112+
0.767360 0.306647 0.290172
113+
0.774048 0.309620 0.291279
114+
0.780555 0.312723 0.292319
115+
0.786871 0.316022 0.293327
116+
0.792976 0.319454 0.294303
117+
0.798871 0.323061 0.295249
118+
0.804548 0.326810 0.296165
119+
0.809995 0.330734 0.297055
120+
0.815214 0.334831 0.297889
121+
0.820195 0.339049 0.298716
122+
0.824940 0.343407 0.299513
123+
0.829449 0.347900 0.300265
124+
0.833714 0.352506 0.300996
125+
0.837741 0.357235 0.301703
126+
0.841532 0.362040 0.302385
127+
0.845096 0.366931 0.303044
128+
0.848438 0.371886 0.303681
129+
0.851566 0.376920 0.304295
130+
0.854494 0.381975 0.304888
131+
0.857225 0.387073 0.305464
132+
0.859779 0.392203 0.306015
133+
0.862161 0.397340 0.306537
134+
0.864380 0.402483 0.307036
135+
0.866454 0.407633 0.307521
136+
0.868402 0.412782 0.308001
137+
0.870213 0.417898 0.308478
138+
0.871931 0.423001 0.308939
139+
0.873540 0.428101 0.309379
140+
0.875064 0.433164 0.309804
141+
0.876507 0.438212 0.310225
142+
0.877887 0.443229 0.310636
143+
0.879200 0.448215 0.311034
144+
0.880462 0.453182 0.311418
145+
0.881681 0.458116 0.311798
146+
0.882852 0.463019 0.312180
147+
0.883997 0.467910 0.312564
148+
0.885105 0.472767 0.312945
149+
0.886191 0.477603 0.313322
150+
0.887249 0.482417 0.313691
151+
0.888294 0.487206 0.314051
152+
0.889321 0.491971 0.314404
153+
0.890332 0.496706 0.314759
154+
0.891333 0.501443 0.315120
155+
0.892326 0.506138 0.315483
156+
0.893303 0.510831 0.315840
157+
0.894281 0.515501 0.316190
158+
0.895249 0.520158 0.316534
159+
0.896210 0.524808 0.316878
160+
0.897169 0.529444 0.317222
161+
0.898117 0.534052 0.317567
162+
0.899069 0.538669 0.317912
163+
0.900015 0.543262 0.318255
164+
0.900957 0.547848 0.318598
165+
0.901898 0.552429 0.318940
166+
0.902840 0.557003 0.319282
167+
0.903774 0.561563 0.319625
168+
0.904711 0.566120 0.319970
169+
0.905648 0.570671 0.320313
170+
0.906580 0.575224 0.320652
171+
0.907514 0.579777 0.320985
172+
0.908445 0.584316 0.321317
173+
0.909375 0.588853 0.321654
174+
0.910310 0.593404 0.321998
175+
0.911239 0.597943 0.322345
176+
0.912171 0.602489 0.322690
177+
0.913105 0.607042 0.323029
178+
0.914040 0.611586 0.323367
179+
0.914970 0.616139 0.323706
180+
0.915902 0.620702 0.324049
181+
0.916845 0.625260 0.324396
182+
0.917784 0.629830 0.324746
183+
0.918718 0.634415 0.325101
184+
0.919662 0.638998 0.325460
185+
0.920604 0.643592 0.325826
186+
0.921555 0.648201 0.326200
187+
0.922507 0.652822 0.326584
188+
0.923462 0.657468 0.326981
189+
0.924416 0.662121 0.327392
190+
0.925379 0.666780 0.327822
191+
0.926347 0.671471 0.328275
192+
0.927318 0.676184 0.328757
193+
0.928297 0.680911 0.329270
194+
0.929285 0.685678 0.329814
195+
0.930283 0.690460 0.330396
196+
0.931285 0.695281 0.331033
197+
0.932296 0.700132 0.331753
198+
0.933319 0.705021 0.332557
199+
0.934357 0.709951 0.333431
200+
0.935409 0.714920 0.334417
201+
0.936478 0.719941 0.335521
202+
0.937557 0.725011 0.336755
203+
0.938655 0.730132 0.338153
204+
0.939775 0.735308 0.339755
205+
0.940913 0.740544 0.341539
206+
0.942077 0.745845 0.343556
207+
0.943262 0.751218 0.345825
208+
0.944473 0.756645 0.348394
209+
0.945709 0.762144 0.351264
210+
0.946974 0.767714 0.354472
211+
0.948266 0.773354 0.358043
212+
0.949586 0.779063 0.362002
213+
0.950938 0.784838 0.366377
214+
0.952312 0.790667 0.371170
215+
0.953719 0.796554 0.376445
216+
0.955147 0.802494 0.382156
217+
0.956597 0.808479 0.388366
218+
0.958072 0.814491 0.395050
219+
0.959559 0.820530 0.402205
220+
0.961064 0.826587 0.409861
221+
0.962575 0.832640 0.417961
222+
0.964092 0.838685 0.426519
223+
0.965612 0.844713 0.435518
224+
0.967132 0.850700 0.444911
225+
0.968639 0.856648 0.454686
226+
0.970133 0.862544 0.464801
227+
0.971612 0.868368 0.475238
228+
0.973070 0.874110 0.485938
229+
0.974498 0.879773 0.496891
230+
0.975902 0.885348 0.508061
231+
0.977278 0.890823 0.519386
232+
0.978614 0.896200 0.530851
233+
0.979924 0.901469 0.542424
234+
0.981192 0.906636 0.554064
235+
0.982426 0.911693 0.565746
236+
0.983617 0.916646 0.577452
237+
0.984777 0.921492 0.589147
238+
0.985893 0.926235 0.600822
239+
0.986977 0.930880 0.612445
240+
0.988017 0.935424 0.624015
241+
0.989027 0.939877 0.635493
242+
0.989999 0.944235 0.646891
243+
0.990934 0.948505 0.658185
244+
0.991836 0.952694 0.669370
245+
0.992705 0.956799 0.680431
246+
0.993538 0.960832 0.691381
247+
0.994334 0.964785 0.702202
248+
0.995098 0.968676 0.712897
249+
0.995829 0.972501 0.723465
250+
0.996528 0.976256 0.733910
251+
0.997193 0.979964 0.744228
252+
0.997826 0.983613 0.754434
253+
0.998426 0.987220 0.764524
254+
0.998993 0.990779 0.774513
255+
0.999523 0.994303 0.784423
256+
1.000000 0.997796 0.794247

0 commit comments

Comments
 (0)