@@ -19,10 +19,10 @@ |
||
19 | 19 | */ |
20 | 20 | interface ModuleMapDefinitionProviderInterface |
21 | 21 | { |
22 | - /** |
|
23 | - * List map definitions provided by the module as an array. |
|
24 | - * |
|
25 | - * @return array<int, MapDefinitionInterface> List of map definitions |
|
26 | - */ |
|
27 | - public function listMapDefinition(): array; |
|
22 | + /** |
|
23 | + * List map definitions provided by the module as an array. |
|
24 | + * |
|
25 | + * @return array<int, MapDefinitionInterface> List of map definitions |
|
26 | + */ |
|
27 | + public function listMapDefinition(): array; |
|
28 | 28 | } |
@@ -22,20 +22,20 @@ |
||
22 | 22 | */ |
23 | 23 | interface ConfigurableTaskInterface |
24 | 24 | { |
25 | - /** |
|
26 | - * Returns the HTML code to display the specific task configuration. |
|
27 | - * |
|
28 | - * @param ServerRequestInterface $request |
|
29 | - * @return string HTML code |
|
30 | - */ |
|
31 | - public function configView(ServerRequestInterface $request): string; |
|
25 | + /** |
|
26 | + * Returns the HTML code to display the specific task configuration. |
|
27 | + * |
|
28 | + * @param ServerRequestInterface $request |
|
29 | + * @return string HTML code |
|
30 | + */ |
|
31 | + public function configView(ServerRequestInterface $request): string; |
|
32 | 32 | |
33 | - /** |
|
34 | - * Update the specific configuration of the task. |
|
35 | - * |
|
36 | - * @param ServerRequestInterface $request |
|
37 | - * @param TaskSchedule $task_schedule |
|
38 | - * @return bool Result of the update |
|
39 | - */ |
|
40 | - public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool; |
|
33 | + /** |
|
34 | + * Update the specific configuration of the task. |
|
35 | + * |
|
36 | + * @param ServerRequestInterface $request |
|
37 | + * @param TaskSchedule $task_schedule |
|
38 | + * @return bool Result of the update |
|
39 | + */ |
|
40 | + public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool; |
|
41 | 41 | } |
@@ -19,11 +19,11 @@ |
||
19 | 19 | */ |
20 | 20 | interface ModuleTasksProviderInterface |
21 | 21 | { |
22 | - /** |
|
23 | - * List tasks provided by the module as an associative array. |
|
24 | - * They keys are used as task IDs for storage and reference. |
|
25 | - * |
|
26 | - * @return array<string, string> List of tasks |
|
27 | - */ |
|
28 | - public function listTasks(): array; |
|
22 | + /** |
|
23 | + * List tasks provided by the module as an associative array. |
|
24 | + * They keys are used as task IDs for storage and reference. |
|
25 | + * |
|
26 | + * @return array<string, string> List of tasks |
|
27 | + */ |
|
28 | + public function listTasks(): array; |
|
29 | 29 | } |
@@ -21,12 +21,12 @@ |
||
21 | 21 | */ |
22 | 22 | class Migration0 implements MigrationInterface |
23 | 23 | { |
24 | - /** |
|
25 | - * {@inheritDoc} |
|
26 | - * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade() |
|
27 | - */ |
|
28 | - public function upgrade(): void |
|
29 | - { |
|
30 | - // These migrations have been merged into migration 2. |
|
31 | - } |
|
24 | + /** |
|
25 | + * {@inheritDoc} |
|
26 | + * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade() |
|
27 | + */ |
|
28 | + public function upgrade(): void |
|
29 | + { |
|
30 | + // These migrations have been merged into migration 2. |
|
31 | + } |
|
32 | 32 | } |
@@ -23,41 +23,41 @@ |
||
23 | 23 | */ |
24 | 24 | class Migration2 implements MigrationInterface |
25 | 25 | { |
26 | - /** |
|
27 | - * {@inheritDoc} |
|
28 | - * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade() |
|
29 | - */ |
|
30 | - public function upgrade(): void |
|
31 | - { |
|
32 | - $in_transaction = DB::connection()->getPdo()->inTransaction(); |
|
33 | - |
|
34 | - // Clean up previous sosa table if it exists |
|
35 | - DB::schema()->dropIfExists('maj_sosa'); |
|
36 | - |
|
37 | - DB::schema()->create('maj_sosa', static function (Blueprint $table): void { |
|
38 | - |
|
39 | - $table->integer('majs_gedcom_id'); |
|
40 | - $table->integer('majs_user_id')->default(-1); |
|
41 | - $table->bigInteger('majs_sosa')->unsigned(); // Allow to calculate sosa on 64 generations |
|
42 | - $table->string('majs_i_id', 20); |
|
43 | - $table->tinyInteger('majs_gen')->nullable(); |
|
44 | - $table->smallInteger('majs_birth_year')->nullable(); |
|
45 | - $table->smallInteger('majs_birth_year_est')->nullable(); |
|
46 | - $table->smallInteger('majs_death_year')->nullable(); |
|
47 | - $table->smallInteger('majs_death_year_est')->nullable(); |
|
48 | - |
|
49 | - $table->primary(['majs_gedcom_id', 'majs_user_id', 'majs_sosa']); |
|
50 | - |
|
51 | - $table->index(['majs_gedcom_id', 'majs_user_id']); |
|
52 | - $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_i_id']); |
|
53 | - $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_gen']); |
|
54 | - |
|
55 | - $table->foreign('majs_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade'); |
|
56 | - $table->foreign('majs_user_id')->references('user_id')->on('user')->onDelete('cascade'); |
|
57 | - }); |
|
58 | - |
|
59 | - if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) { |
|
60 | - DB::connection()->beginTransaction(); |
|
61 | - } |
|
62 | - } |
|
26 | + /** |
|
27 | + * {@inheritDoc} |
|
28 | + * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade() |
|
29 | + */ |
|
30 | + public function upgrade(): void |
|
31 | + { |
|
32 | + $in_transaction = DB::connection()->getPdo()->inTransaction(); |
|
33 | + |
|
34 | + // Clean up previous sosa table if it exists |
|
35 | + DB::schema()->dropIfExists('maj_sosa'); |
|
36 | + |
|
37 | + DB::schema()->create('maj_sosa', static function (Blueprint $table): void { |
|
38 | + |
|
39 | + $table->integer('majs_gedcom_id'); |
|
40 | + $table->integer('majs_user_id')->default(-1); |
|
41 | + $table->bigInteger('majs_sosa')->unsigned(); // Allow to calculate sosa on 64 generations |
|
42 | + $table->string('majs_i_id', 20); |
|
43 | + $table->tinyInteger('majs_gen')->nullable(); |
|
44 | + $table->smallInteger('majs_birth_year')->nullable(); |
|
45 | + $table->smallInteger('majs_birth_year_est')->nullable(); |
|
46 | + $table->smallInteger('majs_death_year')->nullable(); |
|
47 | + $table->smallInteger('majs_death_year_est')->nullable(); |
|
48 | + |
|
49 | + $table->primary(['majs_gedcom_id', 'majs_user_id', 'majs_sosa']); |
|
50 | + |
|
51 | + $table->index(['majs_gedcom_id', 'majs_user_id']); |
|
52 | + $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_i_id']); |
|
53 | + $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_gen']); |
|
54 | + |
|
55 | + $table->foreign('majs_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade'); |
|
56 | + $table->foreign('majs_user_id')->references('user_id')->on('user')->onDelete('cascade'); |
|
57 | + }); |
|
58 | + |
|
59 | + if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) { |
|
60 | + DB::connection()->beginTransaction(); |
|
61 | + } |
|
62 | + } |
|
63 | 63 | } |
@@ -21,12 +21,12 @@ |
||
21 | 21 | */ |
22 | 22 | class Migration1 implements MigrationInterface |
23 | 23 | { |
24 | - /** |
|
25 | - * {@inheritDoc} |
|
26 | - * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade() |
|
27 | - */ |
|
28 | - public function upgrade(): void |
|
29 | - { |
|
30 | - // These migrations have been merged into migration 2. |
|
31 | - } |
|
24 | + /** |
|
25 | + * {@inheritDoc} |
|
26 | + * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade() |
|
27 | + */ |
|
28 | + public function upgrade(): void |
|
29 | + { |
|
30 | + // These migrations have been merged into migration 2. |
|
31 | + } |
|
32 | 32 | } |
@@ -38,142 +38,142 @@ |
||
38 | 38 | */ |
39 | 39 | class SosaStatistics implements RequestHandlerInterface |
40 | 40 | { |
41 | - use ViewResponseTrait; |
|
42 | - |
|
43 | - private ?SosaModule $module; |
|
44 | - private RelationshipService $relationship_service; |
|
45 | - |
|
46 | - /** |
|
47 | - * Constructor for AncestorsList Request Handler |
|
48 | - * |
|
49 | - * @param ModuleService $module_service |
|
50 | - */ |
|
51 | - public function __construct(ModuleService $module_service, RelationshipService $relationship_service) |
|
52 | - { |
|
53 | - $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
54 | - $this->relationship_service = $relationship_service; |
|
55 | - } |
|
56 | - |
|
57 | - /** |
|
58 | - * {@inheritDoc} |
|
59 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
60 | - */ |
|
61 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
62 | - { |
|
63 | - if ($this->module === null) { |
|
64 | - throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
65 | - } |
|
66 | - |
|
67 | - $tree = Validator::attributes($request)->tree(); |
|
68 | - $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
69 | - |
|
70 | - /** @var SosaStatisticsService $sosa_stats_service */ |
|
71 | - $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
72 | - |
|
73 | - return $this->viewResponse($this->module->name() . '::statistics-page', [ |
|
74 | - 'module_name' => $this->module->name(), |
|
75 | - 'title' => I18N::translate('Sosa Statistics'), |
|
76 | - 'tree' => $tree, |
|
77 | - 'theme' => app(ModuleThemeInterface::class), |
|
78 | - 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
79 | - 'general_stats' => $this->statisticsGeneral($sosa_stats_service), |
|
80 | - 'generation_stats' => $this->statisticsByGenerations($sosa_stats_service), |
|
81 | - 'generation_depth' => $sosa_stats_service->generationDepthStatsAtGeneration(1)->first(), |
|
82 | - 'multiple_sosas' => $sosa_stats_service->topMultipleAncestorsWithNoTies(10)->groupBy('sosa_count'), |
|
83 | - 'sosa_dispersion_g2' => $sosa_stats_service->ancestorsDispersionForGeneration(2), |
|
84 | - 'sosa_dispersion_g3' => $sosa_stats_service->ancestorsDispersionForGeneration(3), |
|
85 | - 'gen_depth_g3' => $sosa_stats_service->generationDepthStatsAtGeneration(3), |
|
86 | - 'relationship_service' => $this->relationship_service, |
|
87 | - ]); |
|
88 | - } |
|
89 | - |
|
90 | - /** |
|
91 | - * Retrieve and compute the global statistics of ancestors for the tree. |
|
92 | - * Statistics include the number of ancestors, the number of different ancestors, pedigree collapse... |
|
93 | - * |
|
94 | - * @param SosaStatisticsService $sosa_stats_service |
|
95 | - * @return array<string, int|float> |
|
96 | - */ |
|
97 | - private function statisticsGeneral(SosaStatisticsService $sosa_stats_service): array |
|
98 | - { |
|
99 | - $ancestors_count = $sosa_stats_service->totalAncestors(); |
|
100 | - $ancestors_distinct_count = $sosa_stats_service->totalDistinctAncestors(); |
|
101 | - $individual_count = $sosa_stats_service->totalIndividuals(); |
|
102 | - |
|
103 | - return [ |
|
104 | - 'sosa_count' => $ancestors_count, |
|
105 | - 'distinct_count' => $ancestors_distinct_count, |
|
106 | - 'sosa_rate' => $this->safeDivision( |
|
107 | - BigInteger::of($ancestors_distinct_count), |
|
108 | - BigInteger::of($individual_count) |
|
109 | - ), |
|
110 | - 'mean_gen_time' => $sosa_stats_service->meanGenerationTime() |
|
111 | - ]; |
|
112 | - } |
|
113 | - |
|
114 | - /** |
|
115 | - * Retrieve and compute the statistics of ancestors by generations. |
|
116 | - * Statistics include the number of ancestors, the number of different ancestors, cumulative statistics... |
|
117 | - * |
|
118 | - * @param SosaStatisticsService $sosa_stats_service |
|
119 | - * @return array<int, array<string, int|float>> |
|
120 | - */ |
|
121 | - private function statisticsByGenerations(SosaStatisticsService $sosa_stats_service): array |
|
122 | - { |
|
123 | - $stats_by_gen = $sosa_stats_service->statisticsByGenerations(); |
|
124 | - |
|
125 | - $generation_stats = array(); |
|
126 | - |
|
127 | - foreach ($stats_by_gen as $gen => $stats_gen) { |
|
128 | - $gen_diff = $gen > 1 ? |
|
129 | - (int) $stats_gen['diffSosaTotalCount'] - (int) $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : |
|
130 | - 1; |
|
131 | - $generation_stats[$gen] = array( |
|
132 | - 'gen_min_birth' => $stats_gen['firstBirth'] ?? (int) $stats_gen['firstEstimatedBirth'], |
|
133 | - 'gen_max_birth' => $stats_gen['lastBirth'] ?? (int) $stats_gen['lastEstimatedBirth'], |
|
134 | - 'theoretical' => BigInteger::of(2)->power($gen - 1)->toInt(), |
|
135 | - 'known' => (int) $stats_gen['sosaCount'], |
|
136 | - 'perc_known' => $this->safeDivision( |
|
137 | - BigInteger::of((int) $stats_gen['sosaCount']), |
|
138 | - BigInteger::of(2)->power($gen - 1) |
|
139 | - ), |
|
140 | - 'missing' => $gen > 1 ? |
|
141 | - 2 * (int) $stats_by_gen[$gen - 1]['sosaCount'] - (int) $stats_gen['sosaCount'] : |
|
142 | - 0, |
|
143 | - 'perc_missing' => $gen > 1 ? |
|
144 | - 1 - $this->safeDivision( |
|
145 | - BigInteger::of((int) $stats_gen['sosaCount']), |
|
146 | - BigInteger::of(2 * (int) $stats_by_gen[$gen - 1]['sosaCount']) |
|
147 | - ) : |
|
148 | - 0, |
|
149 | - 'total_known' => (int) $stats_gen['sosaTotalCount'], |
|
150 | - 'perc_total_known' => $this->safeDivision( |
|
151 | - BigInteger::of((int) $stats_gen['sosaTotalCount']), |
|
152 | - BigInteger::of(2)->power($gen)->minus(1) |
|
153 | - ), |
|
154 | - 'different' => $gen_diff, |
|
155 | - 'perc_different' => $this->safeDivision( |
|
156 | - BigInteger::of($gen_diff), |
|
157 | - BigInteger::of((int) $stats_gen['sosaCount']) |
|
158 | - ), |
|
159 | - 'total_different' => (int) $stats_gen['diffSosaTotalCount'] |
|
160 | - ); |
|
161 | - } |
|
162 | - |
|
163 | - return $generation_stats; |
|
164 | - } |
|
165 | - |
|
166 | - /** |
|
167 | - * Return the result of a division, and a default value if denominator is 0 |
|
168 | - * |
|
169 | - * @param BigInteger $p Numerator |
|
170 | - * @param BigInteger $q Denominator |
|
171 | - * @param int $scale Rounding scale |
|
172 | - * @param float $default Value if denominator is 0 |
|
173 | - * @return float |
|
174 | - */ |
|
175 | - private function safeDivision(BigInteger $p, BigInteger $q, int $scale = 10, float $default = 0): float |
|
176 | - { |
|
177 | - return $q->isZero() ? $default : $p->toBigDecimal()->dividedBy($q, $scale, RoundingMode::HALF_DOWN)->toFloat(); |
|
178 | - } |
|
41 | + use ViewResponseTrait; |
|
42 | + |
|
43 | + private ?SosaModule $module; |
|
44 | + private RelationshipService $relationship_service; |
|
45 | + |
|
46 | + /** |
|
47 | + * Constructor for AncestorsList Request Handler |
|
48 | + * |
|
49 | + * @param ModuleService $module_service |
|
50 | + */ |
|
51 | + public function __construct(ModuleService $module_service, RelationshipService $relationship_service) |
|
52 | + { |
|
53 | + $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
54 | + $this->relationship_service = $relationship_service; |
|
55 | + } |
|
56 | + |
|
57 | + /** |
|
58 | + * {@inheritDoc} |
|
59 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
60 | + */ |
|
61 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
62 | + { |
|
63 | + if ($this->module === null) { |
|
64 | + throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
65 | + } |
|
66 | + |
|
67 | + $tree = Validator::attributes($request)->tree(); |
|
68 | + $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
69 | + |
|
70 | + /** @var SosaStatisticsService $sosa_stats_service */ |
|
71 | + $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
72 | + |
|
73 | + return $this->viewResponse($this->module->name() . '::statistics-page', [ |
|
74 | + 'module_name' => $this->module->name(), |
|
75 | + 'title' => I18N::translate('Sosa Statistics'), |
|
76 | + 'tree' => $tree, |
|
77 | + 'theme' => app(ModuleThemeInterface::class), |
|
78 | + 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
79 | + 'general_stats' => $this->statisticsGeneral($sosa_stats_service), |
|
80 | + 'generation_stats' => $this->statisticsByGenerations($sosa_stats_service), |
|
81 | + 'generation_depth' => $sosa_stats_service->generationDepthStatsAtGeneration(1)->first(), |
|
82 | + 'multiple_sosas' => $sosa_stats_service->topMultipleAncestorsWithNoTies(10)->groupBy('sosa_count'), |
|
83 | + 'sosa_dispersion_g2' => $sosa_stats_service->ancestorsDispersionForGeneration(2), |
|
84 | + 'sosa_dispersion_g3' => $sosa_stats_service->ancestorsDispersionForGeneration(3), |
|
85 | + 'gen_depth_g3' => $sosa_stats_service->generationDepthStatsAtGeneration(3), |
|
86 | + 'relationship_service' => $this->relationship_service, |
|
87 | + ]); |
|
88 | + } |
|
89 | + |
|
90 | + /** |
|
91 | + * Retrieve and compute the global statistics of ancestors for the tree. |
|
92 | + * Statistics include the number of ancestors, the number of different ancestors, pedigree collapse... |
|
93 | + * |
|
94 | + * @param SosaStatisticsService $sosa_stats_service |
|
95 | + * @return array<string, int|float> |
|
96 | + */ |
|
97 | + private function statisticsGeneral(SosaStatisticsService $sosa_stats_service): array |
|
98 | + { |
|
99 | + $ancestors_count = $sosa_stats_service->totalAncestors(); |
|
100 | + $ancestors_distinct_count = $sosa_stats_service->totalDistinctAncestors(); |
|
101 | + $individual_count = $sosa_stats_service->totalIndividuals(); |
|
102 | + |
|
103 | + return [ |
|
104 | + 'sosa_count' => $ancestors_count, |
|
105 | + 'distinct_count' => $ancestors_distinct_count, |
|
106 | + 'sosa_rate' => $this->safeDivision( |
|
107 | + BigInteger::of($ancestors_distinct_count), |
|
108 | + BigInteger::of($individual_count) |
|
109 | + ), |
|
110 | + 'mean_gen_time' => $sosa_stats_service->meanGenerationTime() |
|
111 | + ]; |
|
112 | + } |
|
113 | + |
|
114 | + /** |
|
115 | + * Retrieve and compute the statistics of ancestors by generations. |
|
116 | + * Statistics include the number of ancestors, the number of different ancestors, cumulative statistics... |
|
117 | + * |
|
118 | + * @param SosaStatisticsService $sosa_stats_service |
|
119 | + * @return array<int, array<string, int|float>> |
|
120 | + */ |
|
121 | + private function statisticsByGenerations(SosaStatisticsService $sosa_stats_service): array |
|
122 | + { |
|
123 | + $stats_by_gen = $sosa_stats_service->statisticsByGenerations(); |
|
124 | + |
|
125 | + $generation_stats = array(); |
|
126 | + |
|
127 | + foreach ($stats_by_gen as $gen => $stats_gen) { |
|
128 | + $gen_diff = $gen > 1 ? |
|
129 | + (int) $stats_gen['diffSosaTotalCount'] - (int) $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : |
|
130 | + 1; |
|
131 | + $generation_stats[$gen] = array( |
|
132 | + 'gen_min_birth' => $stats_gen['firstBirth'] ?? (int) $stats_gen['firstEstimatedBirth'], |
|
133 | + 'gen_max_birth' => $stats_gen['lastBirth'] ?? (int) $stats_gen['lastEstimatedBirth'], |
|
134 | + 'theoretical' => BigInteger::of(2)->power($gen - 1)->toInt(), |
|
135 | + 'known' => (int) $stats_gen['sosaCount'], |
|
136 | + 'perc_known' => $this->safeDivision( |
|
137 | + BigInteger::of((int) $stats_gen['sosaCount']), |
|
138 | + BigInteger::of(2)->power($gen - 1) |
|
139 | + ), |
|
140 | + 'missing' => $gen > 1 ? |
|
141 | + 2 * (int) $stats_by_gen[$gen - 1]['sosaCount'] - (int) $stats_gen['sosaCount'] : |
|
142 | + 0, |
|
143 | + 'perc_missing' => $gen > 1 ? |
|
144 | + 1 - $this->safeDivision( |
|
145 | + BigInteger::of((int) $stats_gen['sosaCount']), |
|
146 | + BigInteger::of(2 * (int) $stats_by_gen[$gen - 1]['sosaCount']) |
|
147 | + ) : |
|
148 | + 0, |
|
149 | + 'total_known' => (int) $stats_gen['sosaTotalCount'], |
|
150 | + 'perc_total_known' => $this->safeDivision( |
|
151 | + BigInteger::of((int) $stats_gen['sosaTotalCount']), |
|
152 | + BigInteger::of(2)->power($gen)->minus(1) |
|
153 | + ), |
|
154 | + 'different' => $gen_diff, |
|
155 | + 'perc_different' => $this->safeDivision( |
|
156 | + BigInteger::of($gen_diff), |
|
157 | + BigInteger::of((int) $stats_gen['sosaCount']) |
|
158 | + ), |
|
159 | + 'total_different' => (int) $stats_gen['diffSosaTotalCount'] |
|
160 | + ); |
|
161 | + } |
|
162 | + |
|
163 | + return $generation_stats; |
|
164 | + } |
|
165 | + |
|
166 | + /** |
|
167 | + * Return the result of a division, and a default value if denominator is 0 |
|
168 | + * |
|
169 | + * @param BigInteger $p Numerator |
|
170 | + * @param BigInteger $q Denominator |
|
171 | + * @param int $scale Rounding scale |
|
172 | + * @param float $default Value if denominator is 0 |
|
173 | + * @return float |
|
174 | + */ |
|
175 | + private function safeDivision(BigInteger $p, BigInteger $q, int $scale = 10, float $default = 0): float |
|
176 | + { |
|
177 | + return $q->isZero() ? $default : $p->toBigDecimal()->dividedBy($q, $scale, RoundingMode::HALF_DOWN)->toFloat(); |
|
178 | + } |
|
179 | 179 | } |
@@ -34,48 +34,48 @@ |
||
34 | 34 | */ |
35 | 35 | class AncestorsList implements RequestHandlerInterface |
36 | 36 | { |
37 | - use ViewResponseTrait; |
|
37 | + use ViewResponseTrait; |
|
38 | 38 | |
39 | - private ?SosaModule $module; |
|
39 | + private ?SosaModule $module; |
|
40 | 40 | |
41 | - /** |
|
42 | - * Constructor for AncestorsList Request Handler |
|
43 | - * |
|
44 | - * @param ModuleService $module_service |
|
45 | - */ |
|
46 | - public function __construct(ModuleService $module_service) |
|
47 | - { |
|
48 | - $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
49 | - } |
|
41 | + /** |
|
42 | + * Constructor for AncestorsList Request Handler |
|
43 | + * |
|
44 | + * @param ModuleService $module_service |
|
45 | + */ |
|
46 | + public function __construct(ModuleService $module_service) |
|
47 | + { |
|
48 | + $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * {@inheritDoc} |
|
53 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
54 | - */ |
|
55 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
56 | - { |
|
57 | - if ($this->module === null) { |
|
58 | - throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
59 | - } |
|
51 | + /** |
|
52 | + * {@inheritDoc} |
|
53 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
54 | + */ |
|
55 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
56 | + { |
|
57 | + if ($this->module === null) { |
|
58 | + throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
59 | + } |
|
60 | 60 | |
61 | - $tree = Validator::attributes($request)->tree(); |
|
62 | - $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
61 | + $tree = Validator::attributes($request)->tree(); |
|
62 | + $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
63 | 63 | |
64 | - /** @var SosaStatisticsService $sosa_stats_service */ |
|
65 | - $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
64 | + /** @var SosaStatisticsService $sosa_stats_service */ |
|
65 | + $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
66 | 66 | |
67 | - $current_gen = Validator::queryParams($request)->integer( |
|
68 | - 'gen', |
|
69 | - Validator::attributes($request)->integer('gen', 0) |
|
70 | - ); |
|
67 | + $current_gen = Validator::queryParams($request)->integer( |
|
68 | + 'gen', |
|
69 | + Validator::attributes($request)->integer('gen', 0) |
|
70 | + ); |
|
71 | 71 | |
72 | - return $this->viewResponse($this->module->name() . '::list-ancestors-page', [ |
|
73 | - 'module_name' => $this->module->name(), |
|
74 | - 'title' => I18N::translate('Sosa Ancestors'), |
|
75 | - 'tree' => $tree, |
|
76 | - 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
77 | - 'max_gen' => $sosa_stats_service->maxGeneration(), |
|
78 | - 'current_gen' => $current_gen |
|
79 | - ]); |
|
80 | - } |
|
72 | + return $this->viewResponse($this->module->name() . '::list-ancestors-page', [ |
|
73 | + 'module_name' => $this->module->name(), |
|
74 | + 'title' => I18N::translate('Sosa Ancestors'), |
|
75 | + 'tree' => $tree, |
|
76 | + 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
77 | + 'max_gen' => $sosa_stats_service->maxGeneration(), |
|
78 | + 'current_gen' => $current_gen |
|
79 | + ]); |
|
80 | + } |
|
81 | 81 | } |
@@ -37,89 +37,89 @@ |
||
37 | 37 | */ |
38 | 38 | class MissingAncestorsList implements RequestHandlerInterface |
39 | 39 | { |
40 | - use ViewResponseTrait; |
|
41 | - |
|
42 | - /** |
|
43 | - * @var SosaModule|null $module |
|
44 | - */ |
|
45 | - private $module; |
|
46 | - |
|
47 | - /** |
|
48 | - * @var SosaRecordsService $sosa_record_service |
|
49 | - */ |
|
50 | - private $sosa_record_service; |
|
51 | - |
|
52 | - /** |
|
53 | - * Constructor for MissingAncestorsList Request Handler |
|
54 | - * |
|
55 | - * @param ModuleService $module_service |
|
56 | - * @param SosaRecordsService $sosa_record_service |
|
57 | - */ |
|
58 | - public function __construct( |
|
59 | - ModuleService $module_service, |
|
60 | - SosaRecordsService $sosa_record_service |
|
61 | - ) { |
|
62 | - $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
63 | - $this->sosa_record_service = $sosa_record_service; |
|
64 | - } |
|
65 | - |
|
66 | - /** |
|
67 | - * {@inheritDoc} |
|
68 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
69 | - */ |
|
70 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
71 | - { |
|
72 | - if ($this->module === null) { |
|
73 | - throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
74 | - } |
|
75 | - |
|
76 | - $tree = Validator::attributes($request)->tree(); |
|
77 | - $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
78 | - |
|
79 | - /** @var SosaStatisticsService $sosa_stats_service */ |
|
80 | - $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
81 | - |
|
82 | - $current_gen = Validator::queryParams($request)->integer( |
|
83 | - 'gen', |
|
84 | - Validator::attributes($request)->integer('gen', 0) |
|
85 | - ); |
|
86 | - |
|
87 | - $list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen); |
|
88 | - $nb_missing_diff = $list_missing->sum(function (stdClass $value): int { |
|
89 | - return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0); |
|
90 | - }); |
|
91 | - |
|
92 | - $list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor { |
|
93 | - $indi = Registry::individualFactory()->make($value->majs_i_id, $tree); |
|
94 | - if ($indi !== null && $indi->canShowName()) { |
|
95 | - return new MissingAncestor( |
|
96 | - $indi, |
|
97 | - (int) $value->majs_sosa, |
|
98 | - $value->majs_fat_id === null, |
|
99 | - $value->majs_mot_id === null |
|
100 | - ); |
|
101 | - } |
|
102 | - return null; |
|
103 | - })->filter(); |
|
104 | - |
|
105 | - $nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int { |
|
106 | - return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0); |
|
107 | - }); |
|
108 | - |
|
109 | - return $this->viewResponse($this->module->name() . '::list-missing-page', [ |
|
110 | - 'module_name' => $this->module->name(), |
|
111 | - 'title' => I18N::translate('Missing Ancestors'), |
|
112 | - 'tree' => $tree, |
|
113 | - 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
114 | - 'max_gen' => $sosa_stats_service->maxGeneration(), |
|
115 | - 'current_gen' => $current_gen, |
|
116 | - 'list_missing' => $list_missing, |
|
117 | - 'nb_missing_diff' => $nb_missing_diff, |
|
118 | - 'nb_missing_shown' => $nb_missing_shown, |
|
119 | - 'gen_completeness' => |
|
120 | - $sosa_stats_service->totalAncestorsAtGeneration($current_gen) / pow(2, $current_gen - 1), |
|
121 | - 'gen_potential' => |
|
122 | - $sosa_stats_service->totalAncestorsAtGeneration($current_gen - 1) / pow(2, $current_gen - 2) |
|
123 | - ]); |
|
124 | - } |
|
40 | + use ViewResponseTrait; |
|
41 | + |
|
42 | + /** |
|
43 | + * @var SosaModule|null $module |
|
44 | + */ |
|
45 | + private $module; |
|
46 | + |
|
47 | + /** |
|
48 | + * @var SosaRecordsService $sosa_record_service |
|
49 | + */ |
|
50 | + private $sosa_record_service; |
|
51 | + |
|
52 | + /** |
|
53 | + * Constructor for MissingAncestorsList Request Handler |
|
54 | + * |
|
55 | + * @param ModuleService $module_service |
|
56 | + * @param SosaRecordsService $sosa_record_service |
|
57 | + */ |
|
58 | + public function __construct( |
|
59 | + ModuleService $module_service, |
|
60 | + SosaRecordsService $sosa_record_service |
|
61 | + ) { |
|
62 | + $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
63 | + $this->sosa_record_service = $sosa_record_service; |
|
64 | + } |
|
65 | + |
|
66 | + /** |
|
67 | + * {@inheritDoc} |
|
68 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
69 | + */ |
|
70 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
71 | + { |
|
72 | + if ($this->module === null) { |
|
73 | + throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
74 | + } |
|
75 | + |
|
76 | + $tree = Validator::attributes($request)->tree(); |
|
77 | + $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
78 | + |
|
79 | + /** @var SosaStatisticsService $sosa_stats_service */ |
|
80 | + $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
81 | + |
|
82 | + $current_gen = Validator::queryParams($request)->integer( |
|
83 | + 'gen', |
|
84 | + Validator::attributes($request)->integer('gen', 0) |
|
85 | + ); |
|
86 | + |
|
87 | + $list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen); |
|
88 | + $nb_missing_diff = $list_missing->sum(function (stdClass $value): int { |
|
89 | + return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0); |
|
90 | + }); |
|
91 | + |
|
92 | + $list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor { |
|
93 | + $indi = Registry::individualFactory()->make($value->majs_i_id, $tree); |
|
94 | + if ($indi !== null && $indi->canShowName()) { |
|
95 | + return new MissingAncestor( |
|
96 | + $indi, |
|
97 | + (int) $value->majs_sosa, |
|
98 | + $value->majs_fat_id === null, |
|
99 | + $value->majs_mot_id === null |
|
100 | + ); |
|
101 | + } |
|
102 | + return null; |
|
103 | + })->filter(); |
|
104 | + |
|
105 | + $nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int { |
|
106 | + return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0); |
|
107 | + }); |
|
108 | + |
|
109 | + return $this->viewResponse($this->module->name() . '::list-missing-page', [ |
|
110 | + 'module_name' => $this->module->name(), |
|
111 | + 'title' => I18N::translate('Missing Ancestors'), |
|
112 | + 'tree' => $tree, |
|
113 | + 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
114 | + 'max_gen' => $sosa_stats_service->maxGeneration(), |
|
115 | + 'current_gen' => $current_gen, |
|
116 | + 'list_missing' => $list_missing, |
|
117 | + 'nb_missing_diff' => $nb_missing_diff, |
|
118 | + 'nb_missing_shown' => $nb_missing_shown, |
|
119 | + 'gen_completeness' => |
|
120 | + $sosa_stats_service->totalAncestorsAtGeneration($current_gen) / pow(2, $current_gen - 1), |
|
121 | + 'gen_potential' => |
|
122 | + $sosa_stats_service->totalAncestorsAtGeneration($current_gen - 1) / pow(2, $current_gen - 2) |
|
123 | + ]); |
|
124 | + } |
|
125 | 125 | } |