Skip to content

Commit

Permalink
finish code 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bardisk
Bardisk committed Apr 3, 2023
1 parent c4506a5 commit 6eae038
Show file tree
Hide file tree
Showing 8 changed files with 751 additions and 690 deletions.
146 changes: 73 additions & 73 deletions Data/GDP.csv
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
State, 2022GDP
Alabama, 55223
Antigua and Barbuda, 16787
Aruba, 31990
Bahamas, 32246
Belgium, 50598
Belize, 6096
British Virgin Islands, 51000
Bulgaria, 12505
California, 93130
Connecticut, 89301
Cork, 101509
Croatia, 17318
Cyprus, 29535
Denmark, 65713
Dominican Republic, 10573
Estonia, 29344
Florida, 63081
France, 42330
Georgia, 6770
Germany, 48398
Gibraltar, 43000
Greece, 20876
Grenada, 10477
Guadeloupe, 63385
Guatemala, 4880
Hawaii, 68985
Hungary, 18983
Illinois, 82789
Ireland, 102217
Italy, 33740
Jersey, 81307
Louisiana, 62011
Maine, 61491
Malta, 32912
Martinique, 40900
Maryland, 76958
Massachusetts, 99274
Mexico, 58589
Michigan, 62454
Mississippi, 47572
Monaco, 234316
Netherlands, 56298
Netherlands Antilles, 28000
New Jersey, 81307
New York, 105226
North Carolina, 68784
Norway, 92646
Ohio, 70567
Oregon, 71150
Panama, 16173
Portugal, 24910
Puerto Rico, 38443
Rhode Island, 65879
Romania, 15619
Saint Kitts and Nevis, 19129
Saint Lucia, 10763
Saint Vincent and the Grenadines, 8546
Sint Maarten (Dutch part), 57767
Slovenia, 29469
South Carolina, 56593
Spain, 29198
Sweden, 56361
Switzerland, 92434
Texas, 79995
Trinidad and Tobago, 20746
Turkey, 9961
U.S. Virgin Islands, 38500
United Kingdom, 47318
Virginia, 74375
Washington, 93977
West Indies, 2466
Wisconsin, 68680
CRS,gdp,pop,gini,hdi
Alabama,55223,,,
Antigua and Barbuda,16787,85632,,
Aruba,31990,,,
Bahamas,32246,,,
Belgium,50598,11730564,,
Belize,6096,441471,,
British Virgin Islands,51000,,,
Bulgaria,12505,,,
California,93130,,,
Connecticut,89301,,,
Cork,101509,,,
Croatia,17318,,,
Cyprus,29535,,,
Denmark,65713,,,
Dominican Republic,10573,,,
Estonia,29344,,,
Florida,63081,,,
France,42330,,,
Georgia,6770,,,
Germany,48398,,,
Gibraltar,43000,,,
Greece,20876,,,
Grenada,10477,,,
Guadeloupe,63385,,,
Guatemala,4880,,,
Hawaii,68985,,,
Hungary,18983,,,
Illinois,82789,,,
Ireland,102217,,,
Italy,33740,,,
Jersey,81307,,,
Louisiana,62011,,,
Maine,61491,,,
Malta,32912,,,
Martinique,40900,,,
Maryland,76958,,,
Massachusetts,99274,,,
Mexico,58589,,,
Michigan,62454,,,
Mississippi,47572,,,
Monaco,234316,39150,,
Netherlands,56298,17812460,,
Netherlands Antilles,28000,,,
New Jersey,81307,,,
New York,105226,,,
North Carolina,68784,,,
Norway,92646,,,
Ohio,70567,,,
Oregon,71150,,,
Panama,16173,,,
Portugal,24910,,,
Puerto Rico,38443,,,
Rhode Island,65879,,,
Romania,15619,19053815,,
Saint Kitts and Nevis,19129,,,
Saint Lucia,10763,,,
Saint Vincent and the Grenadines,8546,,,
Sint Maarten (Dutch part),57767,,,
Slovenia,29469,,,
South Carolina,56593,,,
Spain,29198,,,
Sweden,56361,,,
Switzerland,92434,,,
Texas,79995,,,
Trinidad and Tobago,20746,1367558,,
Turkey,9961,85279553,,
U.S. Virgin Islands,38500,87146,,
United Kingdom,47318,67026292,,
Virginia,74375,,,
Washington,93977,,,
West Indies,2466,,,
Wisconsin,68680,,,
222 changes: 111 additions & 111 deletions Data/Catamaran.csv → Data/cata_add.csv
View file
Original file line number Diff line number Diff line change
@@ -1,111 +1,111 @@
Variant,Draft,Beam,Water,Fuel,Cabins,dispalcement
Alliaura Feeling 39 DI,3,13.9,92,38,3,17251
Antares 44GS,,21.75,120,150,3,
Antares 44i,4,21.75,150,120,3,
Bali 4.0,4.17,22,55.74,27.74,4,19842
Bali 4.1,4,22,211,103,4,18959
Bali 4.3,,23.33,211,422,3,
Bali 4.3 LOFT,3,23,211,211,6,24912
Bali 4.5,,24.42,211,422,3,
Bali 4.6,,25,211,211,3,
Bali 5.4,,28.5,,,4,
Broadblue 385,3.5,19.7,125,132,,15876
Broadblue 415,4.5,22,130,200,3,
Broadblue 435,4.1,22,,,,20061
Catana 47,8.17,24.92,177,158.5,3,
Catana 47 Ocean Class,9.17,25,177,158.5,4,
Chris White Atlantic 48,3.2,26.3,,,,21500
Chris White Atlantic 49MF,3.6,24.2,,,,20000
Chris White MastFoil 40,,,,,,
Dix Harvey DH550,3.58,28.5,265,245,3,
Dolphin Ocema Ocema 42,3.3,23,311.3,131.9,,
Fountaine Pajot Astrea 42,,23.5,,,,
Fountaine Pajot Athena 38,3.08,20.67,125,52,4,
Fountaine Pajot Bahia 46,6.89,24.28,211.34,105.67,6,
Fountaine Pajot Belize 43,,23,,,3,
Fountaine Pajot Helia 44,3.67,24.25,198,126,3,10800
Fountaine Pajot Helia 44 Evolution,3.77,24.28,198.13,71.33,4,
Fountaine Pajot Helia 44 Maestro,3.67,24.25,198,126,3,
Fountaine Pajot Lavezzi 40,3.64,21.36,147.94,66.04,3,
Fountaine Pajot Lipari 41,3.67,22.08,140,80,4,7600
Fountaine Pajot Lucia 40,3.75,21.58,140.02,79.25,3,19621
Fountaine Pajot Lucia 40 Owner's Version,3,21,265,300,3,8900
Fountaine Pajot Orana 44,3.92,24.08,150,105,3,
Fountaine Pajot Pajot Bahia 46,6.89,24.28,211.34,105.67,6,
Fountaine Pajot SABA 50,3.67,27.75,184.92,248.32,6,34613
Fountaine Pajot SABA 50 Maestro,4.1,26.18,184.92,248.32,5,
Fountaine Pajot Salina 48,3.58,25,140,122,3,
Fountaine Pajot Salina 48 Evolution,3.58,25,140,122,3,
Fountaine Pajot Saona 47,4.17,25.25,185,248,3,30424
HH Catamarans HH55 Catamaran,10.83,26.58,,,,31305
Knysna 440,3.12,23.62,,,4,
Lagoon 380,3.75,21.42,150,52,,
Lagoon 380 Owners Version,3.75,21.42,150,52,4,15679
Lagoon 380 S2,3.75,21.42,79,52,,15697
Lagoon 39,4,22.25,79,106,4,25739
Lagoon 40,4.42,22.17,76,112,,24251
Lagoon 400,4,23.75,200,120,4,22817
Lagoon 400 Owners Version,4,23.75,158,212,3,
Lagoon 400 S2,4,23.75,79,106,3,22817
Lagoon 410,3.94,23.26,184.92,52.83,4,
Lagoon 410-S2,3.94,23.26,105.67,184.92,3,
Lagoon 42,4.08,25.25,79,79,3,26681
Lagoon 42 Owners Version,4.08,25.25,79,158,3,26990
Lagoon 420,,24,,,3,
Lagoon 421,4.17,24.58,92,158,3,26835
Lagoon 440,4.25,25.25,711,771,4,
Lagoon 450,4.25,25.67,184,184,3,
Lagoon 450 Owners Version,4.25,25.75,184,264,3,
Lagoon 450F,4.25,25.75,92,274,3,
Lagoon 450s,4.25,25.83,184,274,4,33000
Lagoon 450S,4.25,25.83,184,274,4,33000
Lagoon 45F,4.25,25.75,92,264,3,
Lagoon 46,4.42,26.83,158,274,,34773
Lagoon 50,4.58,26.58,126,274,3,45921
Lagoon 50 Owners Version,4,26,,,5,
Lagoon 500,4.58,28,253.6,254,4,37639
Lagoon 50F,4,,,,,63934
Lagoon 52,4.92,28.25,,,4,
Lagoon 52 Sport,4.92,28.25,,,4,57403
Lagoon 52F,,28.67,264.18,264.18,,
Lagoon 570,4.58,30,264,198,3,
Leopard 38,3.42,19.75,206,92,8,
Leopard 39,3.67,21,206.05,92.46,3,20073
Leopard 40,4.08,22.08,206,95,3,
Leopard 43,4,22.75,206,95,4,19030
Leopard 44,4.17,23.75,206,184,3,
Leopard 45,4,24,,185,,36156
Leopard 46,3.67,17.25,175,365,3,33489
Leopard 47,,24.25,211,158,,22420
Leopard 48,,25,206,153,3,
Leopard 48 Crewed Version,,25,,,,
Leopard Sunsail 404,4,22,206,95,,20591
Maine Cat 41,7,23,120,92,,
Manta 42 MK II,3.67,21,100,120,3,
Manta 42 MK IV,3.67,21,100,120,3,
Nautitech 40,,21.25,158,71,4,16314
Nautitech 40 Open,4.43,22.67,56.8,56.8,,18739
Nautitech 40.2,3,21,158,71,4,16314
Nautitech 402,3,23,200,36,4,
Nautitech 44,4.75,24.17,158,132,3,
Nautitech 441,3,22,219,105,,20283
Nautitech 442 Owners Version,4,22.3,,,6,20286
Nautitech 46 Fly,4.67,24.58,158.5,158.5,3,
Nautitech 46 Open,4.75,24.75,79.25,79.25,3,
Nautitech 46 open,4.75,24.75,79.25,79.25,3,
Nautitech 47,,24.92,,,4,
Nautitech 542,5.05,28.05,211,211,,32849
Nautitech Open 40,4.43,22.67,56.8,56.8,,18739
Outremer 45,6.5,23.25,108,114,3,
Outremer 49,3,24,100,89,,22000
Privilege 435,4.42,23.33,175,105,,18300
Privilege 495,,24.92,,,,
Privilege Series 5,5.15,26.18,158.5,211.34,4,37038
Seawind 1160,3.58,21.33,185,71,3,14300
Seawind 1190 Sport,4.92,21.33,185,71,3,15620
Seawind 1250,3.9,22.3,184,126,,
Seawind 1260,3.67,22.25,185,126,,18400
Voyage Yachts 500,,27.08,210,132,5,
Voyage Yachts 500 Owner's Version,3,,210,132,,
Voyage Yachts Voyage 480,3.73,25.1,,105,,
Voyage Yachts Voyage 520 DC,,27.1,0,0,,
Variant,Draft,Beam,Water,Fuel,Cabins,Dispalcement
Alliaura Feeling 39 DI,3,13.9,92,38,3,17251
Antares 44GS,,21.75,120,150,3,
Antares 44i,4,21.75,150,120,3,
Bali 4.0,4.17,22,55.74,27.74,4,19842
Bali 4.1,4,22,211,103,4,18959
Bali 4.3,,23.33,211,422,3,
Bali 4.3 LOFT,3,23,211,211,6,24912
Bali 4.5,,24.42,211,422,3,
Bali 4.6,,25,211,211,3,
Bali 5.4,,28.5,,,4,
Broadblue 385,3.5,19.7,125,132,,15876
Broadblue 415,4.5,22,130,200,3,
Broadblue 435,4.1,22,,,,20061
Catana 47,8.17,24.92,177,158.5,3,
Catana 47 Ocean Class,9.17,25,177,158.5,4,
Chris White Atlantic 48,3.2,26.3,,,,21500
Chris White Atlantic 49MF,3.6,24.2,,,,20000
Chris White MastFoil 40,,,,,,
Dix Harvey DH550,3.58,28.5,265,245,3,
Dolphin Ocema Ocema 42,3.3,23,311.3,131.9,,
Fountaine Pajot Astrea 42,,23.5,,,,
Fountaine Pajot Athena 38,3.08,20.67,125,52,4,
Fountaine Pajot Bahia 46,6.89,24.28,211.34,105.67,6,
Fountaine Pajot Belize 43,,23,,,3,
Fountaine Pajot Helia 44,3.67,24.25,198,126,3,10800
Fountaine Pajot Helia 44 Evolution,3.77,24.28,198.13,71.33,4,
Fountaine Pajot Helia 44 Maestro,3.67,24.25,198,126,3,
Fountaine Pajot Lavezzi 40,3.64,21.36,147.94,66.04,3,
Fountaine Pajot Lipari 41,3.67,22.08,140,80,4,7600
Fountaine Pajot Lucia 40,3.75,21.58,140.02,79.25,3,19621
Fountaine Pajot Lucia 40 Owner's Version,3,21,265,300,3,8900
Fountaine Pajot Orana 44,3.92,24.08,150,105,3,
Fountaine Pajot Pajot Bahia 46,6.89,24.28,211.34,105.67,6,
Fountaine Pajot SABA 50,3.67,27.75,184.92,248.32,6,34613
Fountaine Pajot SABA 50 Maestro,4.1,26.18,184.92,248.32,5,
Fountaine Pajot Salina 48,3.58,25,140,122,3,
Fountaine Pajot Salina 48 Evolution,3.58,25,140,122,3,
Fountaine Pajot Saona 47,4.17,25.25,185,248,3,30424
HH Catamarans HH55 Catamaran,10.83,26.58,,,,31305
Knysna 440,3.12,23.62,,,4,
Lagoon 380,3.75,21.42,150,52,,
Lagoon 380 Owners Version,3.75,21.42,150,52,4,15679
Lagoon 380 S2,3.75,21.42,79,52,,15697
Lagoon 39,4,22.25,79,106,4,25739
Lagoon 40,4.42,22.17,76,112,,24251
Lagoon 400,4,23.75,200,120,4,22817
Lagoon 400 Owners Version,4,23.75,158,212,3,
Lagoon 400 S2,4,23.75,79,106,3,22817
Lagoon 410,3.94,23.26,184.92,52.83,4,
Lagoon 410-S2,3.94,23.26,105.67,184.92,3,
Lagoon 42,4.08,25.25,79,79,3,26681
Lagoon 42 Owners Version,4.08,25.25,79,158,3,26990
Lagoon 420,,24,,,3,
Lagoon 421,4.17,24.58,92,158,3,26835
Lagoon 440,4.25,25.25,711,771,4,
Lagoon 450,4.25,25.67,184,184,3,
Lagoon 450 Owners Version,4.25,25.75,184,264,3,
Lagoon 450F,4.25,25.75,92,274,3,
Lagoon 450s,4.25,25.83,184,274,4,33000
Lagoon 450S,4.25,25.83,184,274,4,33000
Lagoon 45F,4.25,25.75,92,264,3,
Lagoon 46,4.42,26.83,158,274,,34773
Lagoon 50,4.58,26.58,126,274,3,45921
Lagoon 50 Owners Version,4,26,,,5,
Lagoon 500,4.58,28,253.6,254,4,37639
Lagoon 50F,4,,,,,63934
Lagoon 52,4.92,28.25,,,4,
Lagoon 52 Sport,4.92,28.25,,,4,57403
Lagoon 52F,,28.67,264.18,264.18,,
Lagoon 570,4.58,30,264,198,3,
Leopard 38,3.42,19.75,206,92,8,
Leopard 39,3.67,21,206.05,92.46,3,20073
Leopard 40,4.08,22.08,206,95,3,
Leopard 43,4,22.75,206,95,4,19030
Leopard 44,4.17,23.75,206,184,3,
Leopard 45,4,24,,185,,36156
Leopard 46,3.67,17.25,175,365,3,33489
Leopard 47,,24.25,211,158,,22420
Leopard 48,,25,206,153,3,
Leopard 48 Crewed Version,,25,,,,
Leopard Sunsail 404,4,22,206,95,,20591
Maine Cat 41,7,23,120,92,,
Manta 42 MK II,3.67,21,100,120,3,
Manta 42 MK IV,3.67,21,100,120,3,
Nautitech 40,,21.25,158,71,4,16314
Nautitech 40 Open,4.43,22.67,56.8,56.8,,18739
Nautitech 40.2,3,21,158,71,4,16314
Nautitech 402,3,23,200,36,4,
Nautitech 44,4.75,24.17,158,132,3,
Nautitech 441,3,22,219,105,,20283
Nautitech 442 Owners Version,4,22.3,,,6,20286
Nautitech 46 Fly,4.67,24.58,158.5,158.5,3,
Nautitech 46 Open,4.75,24.75,79.25,79.25,3,
Nautitech 46 open,4.75,24.75,79.25,79.25,3,
Nautitech 47,,24.92,,,4,
Nautitech 542,5.05,28.05,211,211,,32849
Nautitech Open 40,4.43,22.67,56.8,56.8,,18739
Outremer 45,6.5,23.25,108,114,3,
Outremer 49,3,24,100,89,,22000
Privilege 435,4.42,23.33,175,105,,18300
Privilege 495,,24.92,,,,
Privilege Series 5,5.15,26.18,158.5,211.34,4,37038
Seawind 1160,3.58,21.33,185,71,3,14300
Seawind 1190 Sport,4.92,21.33,185,71,3,15620
Seawind 1250,3.9,22.3,184,126,,
Seawind 1260,3.67,22.25,185,126,,18400
Voyage Yachts 500,,27.08,210,132,5,
Voyage Yachts 500 Owner's Version,3,,210,132,,
Voyage Yachts Voyage 480,3.73,25.1,,105,,
Voyage Yachts Voyage 520 DC,,27.1,0,0,,
24 changes: 12 additions & 12 deletions Data/HongKong_Catamaran.csv → Data/hkcata.csv
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Make, Variant,Year,LOA,Draft,Beam,LAW,Displacement,Water,Fuel,Cabins,Heads,Money
Bali,4.8,2021,48.75,4.5,25.08,47.08,32628,264.17,264.17,3,3,641182
Bali,4.6,2023,46.83,4.17,25.17,45,30424,908.76,211.34,3,3,694433
Lagoon,450,2017,45.8, ,25.82,,, ,,4,4,685000
Bali, CATSPACE,2023,40.33,3.75,21.42,37.25,20723,200.77,105.67,4,4,440134
McConaghy, MC53 Catamaran,2024,50,8.83,26.17,,,132,132,5,,2716875
Lagoon,450,2016,45.8, ,25.52,45.54,,92.6,264.18,3,3,560000
Bali,4.4,2023,45.92,4.33,25.92,42.5,29983,211.34,211.34,4,4,631728
Fountaine Pajot, Samana 59,2023,66.08, ,31.33, ,,303.8,317.07,4,4,3190536
Fountaine Pajot, Saona 47,2020,47.01,4.27,25.26, ,13800,184,124,3,3,1160649
Fountaine Pajot, Tanna 47,2023,45.73,3.94,25.26, , ,184.92,248.32,3,3,1118056
Fountaine Pajot, Alegria 67,2023,72.67,11.67,34.5, , ,304,317,5, ,3613640
Make, Variant,Year,LOA,Draft,Beam,LAW,Displacement,Water,Fuel,Cabins,Heads,Money
Bali,4.8,2021,48.75,4.5,25.08,47.08,32628,264.17,264.17,3,3,641182
Bali,4.6,2023,46.83,4.17,25.17,45,30424,908.76,211.34,3,3,694433
Lagoon,450,2017,45.8, ,25.82,,, ,,4,4,685000
Bali, CATSPACE,2023,40.33,3.75,21.42,37.25,20723,200.77,105.67,4,4,440134
McConaghy, MC53 Catamaran,2024,50,8.83,26.17,,,132,132,5,,2716875
Lagoon,450,2016,45.8, ,25.52,45.54,,92.6,264.18,3,3,560000
Bali,4.4,2023,45.92,4.33,25.92,42.5,29983,211.34,211.34,4,4,631728
Fountaine Pajot, Samana 59,2023,66.08, ,31.33, ,,303.8,317.07,4,4,3190536
Fountaine Pajot, Saona 47,2020,47.01,4.27,25.26, ,13800,184,124,3,3,1160649
Fountaine Pajot, Tanna 47,2023,45.73,3.94,25.26, , ,184.92,248.32,3,3,1118056
Fountaine Pajot, Alegria 67,2023,72.67,11.67,34.5, , ,304,317,5, ,3613640
Loading

0 comments on commit 6eae038

Please sign in to comment.