@@ -19,30 +19,30 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfFrance1901 extends CensusOfFrance implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '17 JAN 1901'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '17 JAN 1901'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnSurname($this, 'Noms', 'Noms de famille'), |
|
39 | - new CensusColumnGivenNames($this, 'Prénoms', ''), |
|
40 | - new CensusColumnAge($this, 'Âge', ''), |
|
41 | - new CensusColumnNationality($this, 'Nationalité', ''), |
|
42 | - new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'), |
|
43 | - new CensusColumnOccupation($this, 'Profession', ''), |
|
44 | - new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'), |
|
45 | - new CensusColumnNull($this, 'Empl', ''), |
|
46 | - ); |
|
47 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnSurname($this, 'Noms', 'Noms de famille'), |
|
39 | + new CensusColumnGivenNames($this, 'Prénoms', ''), |
|
40 | + new CensusColumnAge($this, 'Âge', ''), |
|
41 | + new CensusColumnNationality($this, 'Nationalité', ''), |
|
42 | + new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'), |
|
43 | + new CensusColumnOccupation($this, 'Profession', ''), |
|
44 | + new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'), |
|
45 | + new CensusColumnNull($this, 'Empl', ''), |
|
46 | + ); |
|
47 | + } |
|
48 | 48 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfFrance1901 extends CensusOfFrance implements CensusInterface { |
|
21 | +class CensusOfFrance1901 extends CensusOfFrance implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '17 JAN 1901'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return CensusColumnInterface[] |
35 | 37 | */ |
36 | - public function columns() { |
|
38 | + public function columns() |
|
39 | + { |
|
37 | 40 | return array( |
38 | 41 | new CensusColumnSurname($this, 'Noms', 'Noms de famille'), |
39 | 42 | new CensusColumnGivenNames($this, 'Prénoms', ''), |
@@ -19,6 +19,6 @@ |
||
19 | 19 | * The individual's sex. |
20 | 20 | */ |
21 | 21 | class CensusColumnSexMK extends CensusColumnSexMF { |
22 | - /* Text to display for female individuals */ |
|
23 | - protected $female = 'K'; |
|
22 | + /* Text to display for female individuals */ |
|
23 | + protected $female = 'K'; |
|
24 | 24 | } |
@@ -18,7 +18,8 @@ |
||
18 | 18 | /** |
19 | 19 | * The individual's sex. |
20 | 20 | */ |
21 | -class CensusColumnSexMK extends CensusColumnSexMF { |
|
21 | +class CensusColumnSexMK extends CensusColumnSexMF |
|
22 | +{ |
|
22 | 23 | /* Text to display for female individuals */ |
23 | 24 | protected $female = 'K'; |
24 | 25 | } |
@@ -19,62 +19,62 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfUnitedStates1840 extends CensusOfUnitedStates implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 JUN 1840'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 JUN 1840'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | 38 | |
39 | - new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
|
40 | - new CensusColumnNull($this, 'M0', 'Free white males 0-5 years'), |
|
41 | - new CensusColumnNull($this, 'M5', 'Free white males 5-10 years'), |
|
42 | - new CensusColumnNull($this, 'M10', 'Free white males 10-15 years'), |
|
43 | - new CensusColumnNull($this, 'M15', 'Free white males 15-20 years'), |
|
44 | - new CensusColumnNull($this, 'M20', 'Free white males 20-30 years'), |
|
45 | - new CensusColumnNull($this, 'M30', 'Free white males 30-40 years'), |
|
46 | - new CensusColumnNull($this, 'M40', 'Free white males 40-50 years'), |
|
47 | - new CensusColumnNull($this, 'M50', 'Free white males 50-60 years'), |
|
48 | - new CensusColumnNull($this, 'M60', 'Free white males 60-70 years'), |
|
49 | - new CensusColumnNull($this, 'M70', 'Free white males 70-80 years'), |
|
50 | - new CensusColumnNull($this, 'M80', 'Free white males 80-90 years'), |
|
51 | - new CensusColumnNull($this, 'M90', 'Free white males 90-100 years'), |
|
52 | - new CensusColumnNull($this, 'M100', 'Free white males 100+ years'), |
|
53 | - new CensusColumnNull($this, 'F0', 'Free white females 0-5 years'), |
|
54 | - new CensusColumnNull($this, 'F5', 'Free white females 5-10 years'), |
|
55 | - new CensusColumnNull($this, 'F10', 'Free white females 10-15 years'), |
|
56 | - new CensusColumnNull($this, 'F15', 'Free white females 15-20 years'), |
|
57 | - new CensusColumnNull($this, 'F20', 'Free white females 20-30 years'), |
|
58 | - new CensusColumnNull($this, 'F30', 'Free white females 30-40 years'), |
|
59 | - new CensusColumnNull($this, 'F40', 'Free white females 40-50 years'), |
|
60 | - new CensusColumnNull($this, 'F50', 'Free white females 50-60 years'), |
|
61 | - new CensusColumnNull($this, 'F60', 'Free white females 60-70 years'), |
|
62 | - new CensusColumnNull($this, 'F70', 'Free white females 70-80 years'), |
|
63 | - new CensusColumnNull($this, 'F80', 'Free white females 80-90 years'), |
|
64 | - new CensusColumnNull($this, 'F90', 'Free white females 90-100 years'), |
|
65 | - new CensusColumnNull($this, 'F100', 'Free white females 100+ years'), |
|
66 | - new CensusColumnNull($this, 'M0', 'Free colored males 0-10 years'), |
|
67 | - new CensusColumnNull($this, 'M10', 'Free colored males 10-24 years'), |
|
68 | - new CensusColumnNull($this, 'M24', 'Free colored males 24-36 years'), |
|
69 | - new CensusColumnNull($this, 'M36', 'Free colored males 36-55 years'), |
|
70 | - new CensusColumnNull($this, 'M55', 'Free colored males 55-100 years'), |
|
71 | - new CensusColumnNull($this, 'M100', 'Free colored males 100+ years'), |
|
72 | - new CensusColumnNull($this, 'F0', 'Free colored females 0-10 years'), |
|
73 | - new CensusColumnNull($this, 'F10', 'Free colored females 10-24 years'), |
|
74 | - new CensusColumnNull($this, 'F24', 'Free colored females 24-36 years'), |
|
75 | - new CensusColumnNull($this, 'F36', 'Free colored females 36-55 years'), |
|
76 | - new CensusColumnNull($this, 'F55', 'Free colored females 55-100 years'), |
|
77 | - new CensusColumnNull($this, 'F100', 'Free colored females 100+ years'), |
|
78 | - ); |
|
79 | - } |
|
39 | + new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
|
40 | + new CensusColumnNull($this, 'M0', 'Free white males 0-5 years'), |
|
41 | + new CensusColumnNull($this, 'M5', 'Free white males 5-10 years'), |
|
42 | + new CensusColumnNull($this, 'M10', 'Free white males 10-15 years'), |
|
43 | + new CensusColumnNull($this, 'M15', 'Free white males 15-20 years'), |
|
44 | + new CensusColumnNull($this, 'M20', 'Free white males 20-30 years'), |
|
45 | + new CensusColumnNull($this, 'M30', 'Free white males 30-40 years'), |
|
46 | + new CensusColumnNull($this, 'M40', 'Free white males 40-50 years'), |
|
47 | + new CensusColumnNull($this, 'M50', 'Free white males 50-60 years'), |
|
48 | + new CensusColumnNull($this, 'M60', 'Free white males 60-70 years'), |
|
49 | + new CensusColumnNull($this, 'M70', 'Free white males 70-80 years'), |
|
50 | + new CensusColumnNull($this, 'M80', 'Free white males 80-90 years'), |
|
51 | + new CensusColumnNull($this, 'M90', 'Free white males 90-100 years'), |
|
52 | + new CensusColumnNull($this, 'M100', 'Free white males 100+ years'), |
|
53 | + new CensusColumnNull($this, 'F0', 'Free white females 0-5 years'), |
|
54 | + new CensusColumnNull($this, 'F5', 'Free white females 5-10 years'), |
|
55 | + new CensusColumnNull($this, 'F10', 'Free white females 10-15 years'), |
|
56 | + new CensusColumnNull($this, 'F15', 'Free white females 15-20 years'), |
|
57 | + new CensusColumnNull($this, 'F20', 'Free white females 20-30 years'), |
|
58 | + new CensusColumnNull($this, 'F30', 'Free white females 30-40 years'), |
|
59 | + new CensusColumnNull($this, 'F40', 'Free white females 40-50 years'), |
|
60 | + new CensusColumnNull($this, 'F50', 'Free white females 50-60 years'), |
|
61 | + new CensusColumnNull($this, 'F60', 'Free white females 60-70 years'), |
|
62 | + new CensusColumnNull($this, 'F70', 'Free white females 70-80 years'), |
|
63 | + new CensusColumnNull($this, 'F80', 'Free white females 80-90 years'), |
|
64 | + new CensusColumnNull($this, 'F90', 'Free white females 90-100 years'), |
|
65 | + new CensusColumnNull($this, 'F100', 'Free white females 100+ years'), |
|
66 | + new CensusColumnNull($this, 'M0', 'Free colored males 0-10 years'), |
|
67 | + new CensusColumnNull($this, 'M10', 'Free colored males 10-24 years'), |
|
68 | + new CensusColumnNull($this, 'M24', 'Free colored males 24-36 years'), |
|
69 | + new CensusColumnNull($this, 'M36', 'Free colored males 36-55 years'), |
|
70 | + new CensusColumnNull($this, 'M55', 'Free colored males 55-100 years'), |
|
71 | + new CensusColumnNull($this, 'M100', 'Free colored males 100+ years'), |
|
72 | + new CensusColumnNull($this, 'F0', 'Free colored females 0-10 years'), |
|
73 | + new CensusColumnNull($this, 'F10', 'Free colored females 10-24 years'), |
|
74 | + new CensusColumnNull($this, 'F24', 'Free colored females 24-36 years'), |
|
75 | + new CensusColumnNull($this, 'F36', 'Free colored females 36-55 years'), |
|
76 | + new CensusColumnNull($this, 'F55', 'Free colored females 55-100 years'), |
|
77 | + new CensusColumnNull($this, 'F100', 'Free colored females 100+ years'), |
|
78 | + ); |
|
79 | + } |
|
80 | 80 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfUnitedStates1840 extends CensusOfUnitedStates implements CensusInterface { |
|
21 | +class CensusOfUnitedStates1840 extends CensusOfUnitedStates implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '01 JUN 1840'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return CensusColumnInterface[] |
35 | 37 | */ |
36 | - public function columns() { |
|
38 | + public function columns() |
|
39 | + { |
|
37 | 40 | return array( |
38 | 41 | |
39 | 42 | new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
@@ -21,19 +21,19 @@ |
||
21 | 21 | * The individual's full name. |
22 | 22 | */ |
23 | 23 | class CensusColumnGivenNames extends AbstractCensusColumn implements CensusColumnInterface { |
24 | - /** |
|
25 | - * Generate the likely value of this census column, based on available information. |
|
26 | - * |
|
27 | - * @param Individual $individual |
|
28 | - * @param Individual|null $head |
|
29 | - * |
|
30 | - * @return string |
|
31 | - */ |
|
32 | - public function generate(Individual $individual, Individual $head = null) { |
|
33 | - foreach ($individual->getAllNames() as $name) { |
|
34 | - return $name['givn']; |
|
35 | - } |
|
24 | + /** |
|
25 | + * Generate the likely value of this census column, based on available information. |
|
26 | + * |
|
27 | + * @param Individual $individual |
|
28 | + * @param Individual|null $head |
|
29 | + * |
|
30 | + * @return string |
|
31 | + */ |
|
32 | + public function generate(Individual $individual, Individual $head = null) { |
|
33 | + foreach ($individual->getAllNames() as $name) { |
|
34 | + return $name['givn']; |
|
35 | + } |
|
36 | 36 | |
37 | - return ''; |
|
38 | - } |
|
37 | + return ''; |
|
38 | + } |
|
39 | 39 | } |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * The individual's full name. |
22 | 22 | */ |
23 | -class CensusColumnGivenNames extends AbstractCensusColumn implements CensusColumnInterface { |
|
23 | +class CensusColumnGivenNames extends AbstractCensusColumn implements CensusColumnInterface |
|
24 | +{ |
|
24 | 25 | /** |
25 | 26 | * Generate the likely value of this census column, based on available information. |
26 | 27 | * |
@@ -29,7 +30,8 @@ discard block |
||
29 | 30 | * |
30 | 31 | * @return string |
31 | 32 | */ |
32 | - public function generate(Individual $individual, Individual $head = null) { |
|
33 | + public function generate(Individual $individual, Individual $head = null) |
|
34 | + { |
|
33 | 35 | foreach ($individual->getAllNames() as $name) { |
34 | 36 | return $name['givn']; |
35 | 37 | } |
@@ -19,73 +19,73 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfUnitedStates1830 extends CensusOfUnitedStates implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 JUN 1830'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 JUN 1830'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
|
39 | - new CensusColumnNull($this, 'M0', 'Free white males 0-5 years'), |
|
40 | - new CensusColumnNull($this, 'M5', 'Free white males 5-10 years'), |
|
41 | - new CensusColumnNull($this, 'M10', 'Free white males 10-15 years'), |
|
42 | - new CensusColumnNull($this, 'M15', 'Free white males 15-20 years'), |
|
43 | - new CensusColumnNull($this, 'M20', 'Free white males 20-30 years'), |
|
44 | - new CensusColumnNull($this, 'M30', 'Free white males 30-40 years'), |
|
45 | - new CensusColumnNull($this, 'M40', 'Free white males 40-50 years'), |
|
46 | - new CensusColumnNull($this, 'M50', 'Free white males 50-60 years'), |
|
47 | - new CensusColumnNull($this, 'M60', 'Free white males 60-70 years'), |
|
48 | - new CensusColumnNull($this, 'M70', 'Free white males 70-80 years'), |
|
49 | - new CensusColumnNull($this, 'M80', 'Free white males 80-90 years'), |
|
50 | - new CensusColumnNull($this, 'M90', 'Free white males 90-100 years'), |
|
51 | - new CensusColumnNull($this, 'M100', 'Free white males 100+ years'), |
|
52 | - new CensusColumnNull($this, 'F0', 'Free white females 0-5 years'), |
|
53 | - new CensusColumnNull($this, 'F5', 'Free white females 5-10 years'), |
|
54 | - new CensusColumnNull($this, 'F10', 'Free white females 10-15 years'), |
|
55 | - new CensusColumnNull($this, 'F15', 'Free white females 15-20 years'), |
|
56 | - new CensusColumnNull($this, 'F20', 'Free white females 20-30 years'), |
|
57 | - new CensusColumnNull($this, 'F30', 'Free white females 30-40 years'), |
|
58 | - new CensusColumnNull($this, 'F40', 'Free white females 40-50 years'), |
|
59 | - new CensusColumnNull($this, 'F50', 'Free white females 50-60 years'), |
|
60 | - new CensusColumnNull($this, 'F60', 'Free white females 60-70 years'), |
|
61 | - new CensusColumnNull($this, 'F70', 'Free white females 70-80 years'), |
|
62 | - new CensusColumnNull($this, 'F80', 'Free white females 80-90 years'), |
|
63 | - new CensusColumnNull($this, 'F90', 'Free white females 90-100 years'), |
|
64 | - new CensusColumnNull($this, 'F100', 'Free white females 100+ years'), |
|
65 | - new CensusColumnNull($this, 'M0', 'Slave males 0-10 years'), |
|
66 | - new CensusColumnNull($this, 'M10', 'Slave males 10-24 years'), |
|
67 | - new CensusColumnNull($this, 'M24', 'Slave males 24-36 years'), |
|
68 | - new CensusColumnNull($this, 'M36', 'Slave males 36-55 years'), |
|
69 | - new CensusColumnNull($this, 'M55', 'Slave males 55-100 years'), |
|
70 | - new CensusColumnNull($this, 'M100', 'Slave males 100+ years'), |
|
71 | - new CensusColumnNull($this, 'F0', 'Slave females 0-10 years'), |
|
72 | - new CensusColumnNull($this, 'F10', 'Slave females 10-24 years'), |
|
73 | - new CensusColumnNull($this, 'F24', 'Slave females 24-36 years'), |
|
74 | - new CensusColumnNull($this, 'F36', 'Slave females 36-55 years'), |
|
75 | - new CensusColumnNull($this, 'F55', 'Slave females 55-100 years'), |
|
76 | - new CensusColumnNull($this, 'F100', 'Slave females 100+ years'), |
|
77 | - new CensusColumnNull($this, 'M0', 'Free colored males 0-10 years'), |
|
78 | - new CensusColumnNull($this, 'M10', 'Free colored males 10-24 years'), |
|
79 | - new CensusColumnNull($this, 'M24', 'Free colored males 24-36 years'), |
|
80 | - new CensusColumnNull($this, 'M36', 'Free colored males 36-55 years'), |
|
81 | - new CensusColumnNull($this, 'M55', 'Free colored males 55-100 years'), |
|
82 | - new CensusColumnNull($this, 'M100', 'Free colored males 100+ years'), |
|
83 | - new CensusColumnNull($this, 'F0', 'Free colored females 0-10 years'), |
|
84 | - new CensusColumnNull($this, 'F10', 'Free colored females 10-24 years'), |
|
85 | - new CensusColumnNull($this, 'F24', 'Free colored females 24-36 years'), |
|
86 | - new CensusColumnNull($this, 'F36', 'Free colored females 36-55 years'), |
|
87 | - new CensusColumnNull($this, 'F55', 'Free colored females 55-100 years'), |
|
88 | - new CensusColumnNull($this, 'F100', 'Free colored females 100+ years'), |
|
89 | - ); |
|
90 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
|
39 | + new CensusColumnNull($this, 'M0', 'Free white males 0-5 years'), |
|
40 | + new CensusColumnNull($this, 'M5', 'Free white males 5-10 years'), |
|
41 | + new CensusColumnNull($this, 'M10', 'Free white males 10-15 years'), |
|
42 | + new CensusColumnNull($this, 'M15', 'Free white males 15-20 years'), |
|
43 | + new CensusColumnNull($this, 'M20', 'Free white males 20-30 years'), |
|
44 | + new CensusColumnNull($this, 'M30', 'Free white males 30-40 years'), |
|
45 | + new CensusColumnNull($this, 'M40', 'Free white males 40-50 years'), |
|
46 | + new CensusColumnNull($this, 'M50', 'Free white males 50-60 years'), |
|
47 | + new CensusColumnNull($this, 'M60', 'Free white males 60-70 years'), |
|
48 | + new CensusColumnNull($this, 'M70', 'Free white males 70-80 years'), |
|
49 | + new CensusColumnNull($this, 'M80', 'Free white males 80-90 years'), |
|
50 | + new CensusColumnNull($this, 'M90', 'Free white males 90-100 years'), |
|
51 | + new CensusColumnNull($this, 'M100', 'Free white males 100+ years'), |
|
52 | + new CensusColumnNull($this, 'F0', 'Free white females 0-5 years'), |
|
53 | + new CensusColumnNull($this, 'F5', 'Free white females 5-10 years'), |
|
54 | + new CensusColumnNull($this, 'F10', 'Free white females 10-15 years'), |
|
55 | + new CensusColumnNull($this, 'F15', 'Free white females 15-20 years'), |
|
56 | + new CensusColumnNull($this, 'F20', 'Free white females 20-30 years'), |
|
57 | + new CensusColumnNull($this, 'F30', 'Free white females 30-40 years'), |
|
58 | + new CensusColumnNull($this, 'F40', 'Free white females 40-50 years'), |
|
59 | + new CensusColumnNull($this, 'F50', 'Free white females 50-60 years'), |
|
60 | + new CensusColumnNull($this, 'F60', 'Free white females 60-70 years'), |
|
61 | + new CensusColumnNull($this, 'F70', 'Free white females 70-80 years'), |
|
62 | + new CensusColumnNull($this, 'F80', 'Free white females 80-90 years'), |
|
63 | + new CensusColumnNull($this, 'F90', 'Free white females 90-100 years'), |
|
64 | + new CensusColumnNull($this, 'F100', 'Free white females 100+ years'), |
|
65 | + new CensusColumnNull($this, 'M0', 'Slave males 0-10 years'), |
|
66 | + new CensusColumnNull($this, 'M10', 'Slave males 10-24 years'), |
|
67 | + new CensusColumnNull($this, 'M24', 'Slave males 24-36 years'), |
|
68 | + new CensusColumnNull($this, 'M36', 'Slave males 36-55 years'), |
|
69 | + new CensusColumnNull($this, 'M55', 'Slave males 55-100 years'), |
|
70 | + new CensusColumnNull($this, 'M100', 'Slave males 100+ years'), |
|
71 | + new CensusColumnNull($this, 'F0', 'Slave females 0-10 years'), |
|
72 | + new CensusColumnNull($this, 'F10', 'Slave females 10-24 years'), |
|
73 | + new CensusColumnNull($this, 'F24', 'Slave females 24-36 years'), |
|
74 | + new CensusColumnNull($this, 'F36', 'Slave females 36-55 years'), |
|
75 | + new CensusColumnNull($this, 'F55', 'Slave females 55-100 years'), |
|
76 | + new CensusColumnNull($this, 'F100', 'Slave females 100+ years'), |
|
77 | + new CensusColumnNull($this, 'M0', 'Free colored males 0-10 years'), |
|
78 | + new CensusColumnNull($this, 'M10', 'Free colored males 10-24 years'), |
|
79 | + new CensusColumnNull($this, 'M24', 'Free colored males 24-36 years'), |
|
80 | + new CensusColumnNull($this, 'M36', 'Free colored males 36-55 years'), |
|
81 | + new CensusColumnNull($this, 'M55', 'Free colored males 55-100 years'), |
|
82 | + new CensusColumnNull($this, 'M100', 'Free colored males 100+ years'), |
|
83 | + new CensusColumnNull($this, 'F0', 'Free colored females 0-10 years'), |
|
84 | + new CensusColumnNull($this, 'F10', 'Free colored females 10-24 years'), |
|
85 | + new CensusColumnNull($this, 'F24', 'Free colored females 24-36 years'), |
|
86 | + new CensusColumnNull($this, 'F36', 'Free colored females 36-55 years'), |
|
87 | + new CensusColumnNull($this, 'F55', 'Free colored females 55-100 years'), |
|
88 | + new CensusColumnNull($this, 'F100', 'Free colored females 100+ years'), |
|
89 | + ); |
|
90 | + } |
|
91 | 91 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfUnitedStates1830 extends CensusOfUnitedStates implements CensusInterface { |
|
21 | +class CensusOfUnitedStates1830 extends CensusOfUnitedStates implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '01 JUN 1830'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return CensusColumnInterface[] |
35 | 37 | */ |
36 | - public function columns() { |
|
38 | + public function columns() |
|
39 | + { |
|
37 | 40 | return array( |
38 | 41 | new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
39 | 42 | new CensusColumnNull($this, 'M0', 'Free white males 0-5 years'), |
@@ -19,37 +19,37 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfUnitedStates1800 extends CensusOfUnitedStates implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '04 AUG 1800'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '04 AUG 1800'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
|
39 | - new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'), |
|
40 | - new CensusColumnNull($this, 'M10-16', 'Free white males 10-16 years'), |
|
41 | - new CensusColumnNull($this, 'M16-26', 'Free white males 16-26 years'), |
|
42 | - new CensusColumnNull($this, 'M26-45', 'Free white males 26-45 years'), |
|
43 | - new CensusColumnNull($this, 'M45+', 'Free white males 45+ years'), |
|
44 | - new CensusColumnNull($this, 'F0-10', 'Free white females 0-10 years'), |
|
45 | - new CensusColumnNull($this, 'F10-16', 'Free white females 10-16 years'), |
|
46 | - new CensusColumnNull($this, 'F16-26', 'Free white females 16-26 years'), |
|
47 | - new CensusColumnNull($this, 'F26-45', 'Free white females 26-45 years'), |
|
48 | - new CensusColumnNull($this, 'F45+', 'Free white females 45+ years'), |
|
49 | - new CensusColumnNull($this, 'Free', 'All other free persons, except Indians not taxed'), |
|
50 | - new CensusColumnNull($this, 'Slaves', 'Number of slaves'), |
|
51 | - new CensusColumnNull($this, 'Total', 'Total number of individuals'), |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
|
39 | + new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'), |
|
40 | + new CensusColumnNull($this, 'M10-16', 'Free white males 10-16 years'), |
|
41 | + new CensusColumnNull($this, 'M16-26', 'Free white males 16-26 years'), |
|
42 | + new CensusColumnNull($this, 'M26-45', 'Free white males 26-45 years'), |
|
43 | + new CensusColumnNull($this, 'M45+', 'Free white males 45+ years'), |
|
44 | + new CensusColumnNull($this, 'F0-10', 'Free white females 0-10 years'), |
|
45 | + new CensusColumnNull($this, 'F10-16', 'Free white females 10-16 years'), |
|
46 | + new CensusColumnNull($this, 'F16-26', 'Free white females 16-26 years'), |
|
47 | + new CensusColumnNull($this, 'F26-45', 'Free white females 26-45 years'), |
|
48 | + new CensusColumnNull($this, 'F45+', 'Free white females 45+ years'), |
|
49 | + new CensusColumnNull($this, 'Free', 'All other free persons, except Indians not taxed'), |
|
50 | + new CensusColumnNull($this, 'Slaves', 'Number of slaves'), |
|
51 | + new CensusColumnNull($this, 'Total', 'Total number of individuals'), |
|
52 | 52 | |
53 | - ); |
|
54 | - } |
|
53 | + ); |
|
54 | + } |
|
55 | 55 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfUnitedStates1800 extends CensusOfUnitedStates implements CensusInterface { |
|
21 | +class CensusOfUnitedStates1800 extends CensusOfUnitedStates implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '04 AUG 1800'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return CensusColumnInterface[] |
35 | 37 | */ |
36 | - public function columns() { |
|
38 | + public function columns() |
|
39 | + { |
|
37 | 40 | return array( |
38 | 41 | new CensusColumnFullName($this, 'Name', 'Name of head of family'), |
39 | 42 | new CensusColumnNull($this, 'M0-10', 'Free white males 0-10 years'), |
@@ -19,23 +19,23 @@ |
||
19 | 19 | * Marital status. |
20 | 20 | */ |
21 | 21 | class CensusColumnConditionFrenchVeuve extends AbstractCensusColumnCondition { |
22 | - /* Text to display for married individuals */ |
|
23 | - protected $husband = ''; |
|
24 | - protected $wife = ''; |
|
22 | + /* Text to display for married individuals */ |
|
23 | + protected $husband = ''; |
|
24 | + protected $wife = ''; |
|
25 | 25 | |
26 | - /* Text to display for unmarried individuals */ |
|
27 | - protected $bachelor = ''; |
|
28 | - protected $spinster = ''; |
|
26 | + /* Text to display for unmarried individuals */ |
|
27 | + protected $bachelor = ''; |
|
28 | + protected $spinster = ''; |
|
29 | 29 | |
30 | - /* Text to display for children */ |
|
31 | - protected $boy = ''; |
|
32 | - protected $girl = ''; |
|
30 | + /* Text to display for children */ |
|
31 | + protected $boy = ''; |
|
32 | + protected $girl = ''; |
|
33 | 33 | |
34 | - /* Text to display for divorced individuals */ |
|
35 | - protected $divorce = ''; |
|
36 | - protected $divorcee = ''; |
|
34 | + /* Text to display for divorced individuals */ |
|
35 | + protected $divorce = ''; |
|
36 | + protected $divorcee = ''; |
|
37 | 37 | |
38 | - /* Text to display for widowed individuals (not yet implemented) */ |
|
39 | - protected $widower = ''; |
|
40 | - protected $widow = '1'; |
|
38 | + /* Text to display for widowed individuals (not yet implemented) */ |
|
39 | + protected $widower = ''; |
|
40 | + protected $widow = '1'; |
|
41 | 41 | } |
@@ -18,7 +18,8 @@ |
||
18 | 18 | /** |
19 | 19 | * Marital status. |
20 | 20 | */ |
21 | -class CensusColumnConditionFrenchVeuve extends AbstractCensusColumnCondition { |
|
21 | +class CensusColumnConditionFrenchVeuve extends AbstractCensusColumnCondition |
|
22 | +{ |
|
22 | 23 | /* Text to display for married individuals */ |
23 | 24 | protected $husband = ''; |
24 | 25 | protected $wife = ''; |
@@ -21,28 +21,28 @@ |
||
21 | 21 | * The individual's sex. |
22 | 22 | */ |
23 | 23 | class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInterface { |
24 | - /* Text to display for male individuals */ |
|
25 | - protected $male = 'M'; |
|
24 | + /* Text to display for male individuals */ |
|
25 | + protected $male = 'M'; |
|
26 | 26 | |
27 | - /* Text to display for female individuals */ |
|
28 | - protected $female = 'F'; |
|
27 | + /* Text to display for female individuals */ |
|
28 | + protected $female = 'F'; |
|
29 | 29 | |
30 | - /** |
|
31 | - * Generate the likely value of this census column, based on available information. |
|
32 | - * |
|
33 | - * @param Individual $individual |
|
34 | - * @param Individual|null $head |
|
35 | - * |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function generate(Individual $individual, Individual $head = null) { |
|
39 | - switch ($individual->getSex()) { |
|
40 | - case 'M': |
|
41 | - return $this->male; |
|
42 | - case 'F': |
|
43 | - return $this->female; |
|
44 | - default: |
|
45 | - return ''; |
|
46 | - } |
|
47 | - } |
|
30 | + /** |
|
31 | + * Generate the likely value of this census column, based on available information. |
|
32 | + * |
|
33 | + * @param Individual $individual |
|
34 | + * @param Individual|null $head |
|
35 | + * |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function generate(Individual $individual, Individual $head = null) { |
|
39 | + switch ($individual->getSex()) { |
|
40 | + case 'M': |
|
41 | + return $this->male; |
|
42 | + case 'F': |
|
43 | + return $this->female; |
|
44 | + default: |
|
45 | + return ''; |
|
46 | + } |
|
47 | + } |
|
48 | 48 | } |
@@ -37,12 +37,12 @@ |
||
37 | 37 | */ |
38 | 38 | public function generate(Individual $individual, Individual $head = null) { |
39 | 39 | switch ($individual->getSex()) { |
40 | - case 'M': |
|
41 | - return $this->male; |
|
42 | - case 'F': |
|
43 | - return $this->female; |
|
44 | - default: |
|
45 | - return ''; |
|
40 | + case 'M': |
|
41 | + return $this->male; |
|
42 | + case 'F': |
|
43 | + return $this->female; |
|
44 | + default: |
|
45 | + return ''; |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | } |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * The individual's sex. |
22 | 22 | */ |
23 | -class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInterface { |
|
23 | +class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInterface |
|
24 | +{ |
|
24 | 25 | /* Text to display for male individuals */ |
25 | 26 | protected $male = 'M'; |
26 | 27 | |
@@ -35,7 +36,8 @@ discard block |
||
35 | 36 | * |
36 | 37 | * @return string |
37 | 38 | */ |
38 | - public function generate(Individual $individual, Individual $head = null) { |
|
39 | + public function generate(Individual $individual, Individual $head = null) |
|
40 | + { |
|
39 | 41 | switch ($individual->getSex()) { |
40 | 42 | case 'M': |
41 | 43 | return $this->male; |
@@ -22,21 +22,21 @@ |
||
22 | 22 | * Relationshiop to head of household. |
23 | 23 | */ |
24 | 24 | class CensusColumnRelationToHeadGerman extends AbstractCensusColumn implements CensusColumnInterface { |
25 | - /** |
|
26 | - * Generate the likely value of this census column, based on available information. |
|
27 | - * |
|
28 | - * @param Individual $individual |
|
29 | - * @param Individual|null $head |
|
30 | - * |
|
31 | - * @return string |
|
32 | - */ |
|
33 | - public function generate(Individual $individual, Individual $head = null) { |
|
34 | - if ($head === null) { |
|
35 | - return ''; |
|
36 | - } elseif ($individual == $head) { |
|
37 | - return 'Haushaltungsvorstand'; |
|
38 | - } else { |
|
39 | - return Functions::getCloseRelationshipName($head, $individual); |
|
40 | - } |
|
41 | - } |
|
25 | + /** |
|
26 | + * Generate the likely value of this census column, based on available information. |
|
27 | + * |
|
28 | + * @param Individual $individual |
|
29 | + * @param Individual|null $head |
|
30 | + * |
|
31 | + * @return string |
|
32 | + */ |
|
33 | + public function generate(Individual $individual, Individual $head = null) { |
|
34 | + if ($head === null) { |
|
35 | + return ''; |
|
36 | + } elseif ($individual == $head) { |
|
37 | + return 'Haushaltungsvorstand'; |
|
38 | + } else { |
|
39 | + return Functions::getCloseRelationshipName($head, $individual); |
|
40 | + } |
|
41 | + } |
|
42 | 42 | } |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * Relationshiop to head of household. |
23 | 23 | */ |
24 | -class CensusColumnRelationToHeadGerman extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnRelationToHeadGerman extends AbstractCensusColumn implements CensusColumnInterface |
|
25 | +{ |
|
25 | 26 | /** |
26 | 27 | * Generate the likely value of this census column, based on available information. |
27 | 28 | * |
@@ -30,7 +31,8 @@ discard block |
||
30 | 31 | * |
31 | 32 | * @return string |
32 | 33 | */ |
33 | - public function generate(Individual $individual, Individual $head = null) { |
|
34 | + public function generate(Individual $individual, Individual $head = null) |
|
35 | + { |
|
34 | 36 | if ($head === null) { |
35 | 37 | return ''; |
36 | 38 | } elseif ($individual == $head) { |