jon48 / webtrees-lib

app/Module/Sosa/Services/SosaStatisticsService.php

Spacing +58 added lines, -59 removed lines

@@ -74,7 +74,7 @@ 
      */
     public function maxGeneration(): int
     {
-        return (int) DB::table('maj_sosa')
+        return (int)DB::table('maj_sosa')
             ->where('majs_gedcom_id', '=', $this->tree->id())
             ->where('majs_user_id', '=', $this->user->id())
             ->max('majs_gen');
@@ -152,8 +152,7 @@ 
             ->get()->first();
 
         $denom = $row->n * $row->sum_x2 - pow($row->sum_x, 2);
-        return ((int) $row->n === 0 || $denom === 0) ? 0 :
-            -($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / $denom;
+        return ((int)$row->n === 0 || $denom === 0) ? 0 : -($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / $denom;
     }
 
     /**
@@ -177,10 +176,10 @@ 
 
         $statistics_by_gen = [];
         foreach ($stats_by_gen as $gen => $stats_gen) {
-            $statistics_by_gen[(int) $stats_gen->gen] = array(
-                'sosaCount'             =>  (int) $stats_gen->total_sosa,
-                'sosaTotalCount'        =>  (int) $cumul_stats_by_gen[$gen]->total_cumul,
-                'diffSosaTotalCount'    =>  (int) $cumul_stats_by_gen[$gen]->total_distinct_cumul,
+            $statistics_by_gen[(int)$stats_gen->gen] = array(
+                'sosaCount'             =>  (int)$stats_gen->total_sosa,
+                'sosaTotalCount'        =>  (int)$cumul_stats_by_gen[$gen]->total_cumul,
+                'diffSosaTotalCount'    =>  (int)$cumul_stats_by_gen[$gen]->total_distinct_cumul,
                 'firstBirth'            =>  $stats_gen->first_year,
                 'firstEstimatedBirth'   =>  $stats_gen->first_est_year,
                 'lastBirth'             =>  $stats_gen->last_year,
@@ -224,7 +223,7 @@ 
             ->where('majs_user_id', '=', $this->user->id());
 
         return DB::table('maj_sosa')
-            ->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
+            ->joinSub($list_gen, 'list_gen', function(JoinClause $join): void {
                 $join->on('maj_sosa.majs_gen', '<=', 'list_gen.majs_gen')
                 ->where('majs_gedcom_id', '=', $this->tree->id())
                 ->where('majs_user_id', '=', $this->user->id());
@@ -265,37 +264,37 @@ 
             ->select(['list_gen.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
             ->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
             ->selectRaw(
-                '(CASE ' .
-                    ' WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL' .
-                    ' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
-                    ' ELSE 0 ' .
-                ' END)' .
-                ' + (CASE ' .
-                    ' WHEN ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL' .
-                    ' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
-                    ' ELSE 0 ' .
+                '(CASE '.
+                    ' WHEN '.$table_prefix.'sosa_fat.majs_i_id IS NULL'.
+                    ' THEN POWER(2, '.$table_prefix.'list_gen.majs_gen - '.$table_prefix.'sosa.majs_gen - 1)'.
+                    ' ELSE 0 '.
+                ' END)'.
+                ' + (CASE '.
+                    ' WHEN '.$table_prefix.'sosa_mot.majs_i_id IS NULL'.
+                    ' THEN POWER(2, '.$table_prefix.'list_gen.majs_gen - '.$table_prefix.'sosa.majs_gen - 1)'.
+                    ' ELSE 0 '.
                 ' END) contrib'
             )
-            ->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
+            ->joinSub($list_gen, 'list_gen', function(JoinClause $join): void {
                 $join->on('sosa.majs_gen', '<', 'list_gen.majs_gen')
                     ->where('majs_gedcom_id', '=', $this->tree->id())
                     ->where('majs_user_id', '=', $this->user->id());
             })
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
+            ->leftJoin('maj_sosa AS sosa_fat', function(JoinClause $join) use ($table_prefix): void {
                 // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+                $join->whereRaw($table_prefix.'sosa_fat.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa')
                     ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
                     ->where('sosa_fat.majs_user_id', '=', $this->user->id());
             })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
+            ->leftJoin('maj_sosa AS sosa_mot', function(JoinClause $join) use ($table_prefix): void {
                 // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+                $join->whereRaw($table_prefix.'sosa_mot.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa + 1')
                     ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
                     ->where('sosa_mot.majs_user_id', '=', $this->user->id());
             })
             ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
             ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->where(function (Builder $query): void {
+            ->where(function(Builder $query): void {
                 $query->whereNull('sosa_fat.majs_i_id')
                 ->orWhereNull('sosa_mot.majs_i_id');
             });
@@ -305,24 +304,24 @@ 
          */
         $non_roots_ancestors = DB::table('maj_sosa AS sosa')
             ->select(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id', 'sosa.majs_sosa'])
-            ->selectRaw('MAX(' . $table_prefix . 'sosa_anc.majs_sosa) - MIN(' . $table_prefix . 'sosa_anc.majs_sosa)' .
+            ->selectRaw('MAX('.$table_prefix.'sosa_anc.majs_sosa) - MIN('.$table_prefix.'sosa_anc.majs_sosa)'.
                 ' AS full_ancestors')
-            ->join('maj_sosa AS sosa_anc', function (JoinClause $join) use ($table_prefix): void {
+            ->join('maj_sosa AS sosa_anc', function(JoinClause $join) use ($table_prefix): void {
                 $join->on('sosa.majs_gen', '<', 'sosa_anc.majs_gen')
-                    ->whereRaw('FLOOR(' . $table_prefix . 'sosa_anc.majs_sosa / POWER(2, ' .
-                        $table_prefix . 'sosa_anc.majs_gen - ' . $table_prefix . 'sosa.majs_gen)) = ' .
-                        $table_prefix . 'sosa.majs_sosa')
+                    ->whereRaw('FLOOR('.$table_prefix.'sosa_anc.majs_sosa / POWER(2, '.
+                        $table_prefix.'sosa_anc.majs_gen - '.$table_prefix.'sosa.majs_gen)) = '.
+                        $table_prefix.'sosa.majs_sosa')
                     ->where('sosa_anc.majs_gedcom_id', '=', $this->tree->id())
                     ->where('sosa_anc.majs_user_id', '=', $this->user->id());
             })
             ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
             ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->whereIn('sosa_anc.majs_i_id', function (Builder $query) use ($table_prefix): void {
+            ->whereIn('sosa_anc.majs_i_id', function(Builder $query) use ($table_prefix): void {
                 $query->from('maj_sosa AS sosa_gen')
                 ->select('sosa_gen.majs_i_id')->distinct()
                 ->where('sosa_gen.majs_gedcom_id', '=', $this->tree->id())
                 ->where('sosa_gen.majs_user_id', '=', $this->user->id())
-                ->whereRaw($table_prefix . 'sosa_gen.majs_gen = ' . $table_prefix . 'sosa.majs_gen');
+                ->whereRaw($table_prefix.'sosa_gen.majs_gen = '.$table_prefix.'sosa.majs_gen');
             })
             ->groupBy(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id',
                 'sosa.majs_sosa', 'sosa.majs_i_id']);
@@ -335,7 +334,7 @@ 
             ->select(['sosa.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
             ->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
             ->selectRaw('1 AS contrib')
-            ->leftJoinSub($non_roots_ancestors, 'nonroot', function (JoinClause $join): void {
+            ->leftJoinSub($non_roots_ancestors, 'nonroot', function(JoinClause $join): void {
                 $join->on('sosa.majs_gen', '=', 'nonroot.majs_gen')
                     ->on('sosa.majs_sosa', '=', 'nonroot.majs_sosa')
                     ->where('nonroot.full_ancestors', '>', 0)
@@ -353,9 +352,9 @@ 
             ->fromSub($root_ancestors_contributions->unionAll($known_ancestors_contributions), 'sosa_contribs')
             ->select(['sosa_contribs.gen', 'sosa_contribs.majs_gedcom_id', 'sosa_contribs.majs_user_id'])
             ->addSelect(['sosa_contribs.majs_i_id', 'sosa_contribs.contrib'])
-            ->selectRaw('COUNT(' . $table_prefix . 'sosa_contribs.majs_i_id) * ' .
-                $table_prefix . 'sosa_contribs.contrib AS totalContrib')
-            ->leftJoin('maj_sosa AS sosa_low', function (JoinClause $join): void {
+            ->selectRaw('COUNT('.$table_prefix.'sosa_contribs.majs_i_id) * '.
+                $table_prefix.'sosa_contribs.contrib AS totalContrib')
+            ->leftJoin('maj_sosa AS sosa_low', function(JoinClause $join): void {
                 $join->on('sosa_low.majs_gen', '<', 'sosa_contribs.majs_gen')
                     ->on('sosa_low.majs_i_id', '=', 'sosa_contribs.majs_i_id')
                     ->where('sosa_low.majs_gedcom_id', '=', $this->tree->id())
@@ -376,9 +375,9 @@ 
 
         $pedi_collapse_by_gen = [];
         foreach ($pedi_collapse_coll as $collapse_gen) {
-            $pedi_collapse_by_gen[(int) $collapse_gen->gen] = array(
-                'pedi_collapse_roots'   =>  (float) $collapse_gen->pedi_collapse_roots,
-                'pedi_collapse_xgen'   =>  (float) $collapse_gen->pedi_collapse_xgen
+            $pedi_collapse_by_gen[(int)$collapse_gen->gen] = array(
+                'pedi_collapse_roots'   =>  (float)$collapse_gen->pedi_collapse_roots,
+                'pedi_collapse_xgen'   =>  (float)$collapse_gen->pedi_collapse_xgen
             );
         }
         return $pedi_collapse_by_gen;
@@ -410,26 +409,26 @@ 
 
         $table_prefix = DB::connection()->getTablePrefix();
         $missing_ancestors_by_gen = DB::table('maj_sosa AS sosa')
-            ->selectRaw($table_prefix . 'sosa.majs_gen - ? AS majs_gen_norm', [$gen])
-            ->selectRaw('FLOOR(((' . $table_prefix . 'sosa.majs_sosa / POW(2, ' . $table_prefix . 'sosa.majs_gen -1 )) - 1) * POWER(2, ? - 1)) + POWER(2, ? - 1) AS root_ancestor', [$gen, $gen])   //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
+            ->selectRaw($table_prefix.'sosa.majs_gen - ? AS majs_gen_norm', [$gen])
+            ->selectRaw('FLOOR((('.$table_prefix.'sosa.majs_sosa / POW(2, '.$table_prefix.'sosa.majs_gen -1 )) - 1) * POWER(2, ? - 1)) + POWER(2, ? - 1) AS root_ancestor', [$gen, $gen])   //@phpcs:ignore Generic.Files.LineLength.TooLong
+            ->selectRaw('SUM(CASE WHEN '.$table_prefix.'sosa_fat.majs_i_id IS NULL AND '.$table_prefix.'sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
+            ->selectRaw('SUM(CASE WHEN '.$table_prefix.'sosa_fat.majs_i_id IS NULL AND '.$table_prefix.'sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
+            ->leftJoin('maj_sosa AS sosa_fat', function(JoinClause $join) use ($table_prefix): void {
                 // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+                $join->whereRaw($table_prefix.'sosa_fat.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa')
                 ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
                 ->where('sosa_fat.majs_user_id', '=', $this->user->id());
             })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
+            ->leftJoin('maj_sosa AS sosa_mot', function(JoinClause $join) use ($table_prefix): void {
                 // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+                $join->whereRaw($table_prefix.'sosa_mot.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa + 1')
                 ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
                 ->where('sosa_mot.majs_user_id', '=', $this->user->id());
             })
             ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
             ->where('sosa.majs_user_id', '=', $this->user->id())
             ->where('sosa.majs_gen', '>=', $gen)
-            ->where(function (Builder $query): void {
+            ->where(function(Builder $query): void {
                 $query->whereNull('sosa_fat.majs_i_id')
                     ->orWhereNull('sosa_mot.majs_i_id');
             })
@@ -438,11 +437,11 @@ 
         return DB::table('maj_sosa AS sosa_list')
             ->select(['stats_by_gen.root_ancestor AS root_ancestor_sosa', 'sosa_list.majs_i_id as root_ancestor_id'])
             ->selectRaw('1 + SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))) AS mean_gen_depth')  //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->selectRaw(' SQRT(' .
-                '   SUM(POWER(majs_gen_norm, 2) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm)))' .     //@phpcs:ignore Generic.Files.LineLength.TooLong
-                '   - POWER( SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))), 2)' .       //@phpcs:ignore Generic.Files.LineLength.TooLong
+            ->selectRaw(' SQRT('.
+                '   SUM(POWER(majs_gen_norm, 2) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm)))'.//@phpcs:ignore Generic.Files.LineLength.TooLong
+                '   - POWER( SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))), 2)'.//@phpcs:ignore Generic.Files.LineLength.TooLong
                 ' ) AS stddev_gen_depth')
-            ->joinSub($missing_ancestors_by_gen, 'stats_by_gen', function (JoinClause $join): void {
+            ->joinSub($missing_ancestors_by_gen, 'stats_by_gen', function(JoinClause $join): void {
                 $join->on('sosa_list.majs_sosa', '=', 'stats_by_gen.root_ancestor')
                     ->where('sosa_list.majs_gedcom_id', '=', $this->tree->id())
                     ->where('sosa_list.majs_user_id', '=', $this->user->id());
@@ -471,16 +470,16 @@ 
         $table_prefix = DB::connection()->getTablePrefix();
         $multiple_ancestors = DB::table('maj_sosa AS sosa')
             ->select('sosa.majs_i_id AS sosa_i_id')
-            ->selectRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) AS sosa_count')
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
+            ->selectRaw('COUNT('.$table_prefix.'sosa.majs_sosa) AS sosa_count')
+            ->leftJoin('maj_sosa AS sosa_fat', function(JoinClause $join) use ($table_prefix): void {
                 // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+                $join->whereRaw($table_prefix.'sosa_fat.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa')
                     ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
                     ->where('sosa_fat.majs_user_id', '=', $this->user->id());
             })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
+            ->leftJoin('maj_sosa AS sosa_mot', function(JoinClause $join) use ($table_prefix): void {
                 // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+                $join->whereRaw($table_prefix.'sosa_mot.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa + 1')
                 ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
                 ->where('sosa_mot.majs_user_id', '=', $this->user->id());
             })
@@ -489,15 +488,15 @@ 
             ->whereNull('sosa_fat.majs_sosa')   // We keep only root individuals, i.e. those with no father or mother
             ->whereNull('sosa_mot.majs_sosa')
             ->groupBy('sosa.majs_i_id')
-            ->havingRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) > 1')    // Limit to the duplicate sosas.
-            ->orderByRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) DESC, MIN(' . $table_prefix . 'sosa.majs_sosa) ASC')   //@phpcs:ignore Generic.Files.LineLength.TooLong
+            ->havingRaw('COUNT('.$table_prefix.'sosa.majs_sosa) > 1')    // Limit to the duplicate sosas.
+            ->orderByRaw('COUNT('.$table_prefix.'sosa.majs_sosa) DESC, MIN('.$table_prefix.'sosa.majs_sosa) ASC')   //@phpcs:ignore Generic.Files.LineLength.TooLong
             ->limit($limit + 1)     // We want to select one more than required, for ties
             ->get();
 
         if ($multiple_ancestors->count() > $limit) {
             $last_count = $multiple_ancestors->last()->sosa_count;
             $multiple_ancestors = $multiple_ancestors->reject(
-                fn (stdClass $element): bool => $element->sosa_count ===  $last_count
+                fn (stdClass $element): bool => $element->sosa_count === $last_count
             );
         }
         return $multiple_ancestors;
@@ -552,7 +551,7 @@ 
             ->rightJoinSub(
                 $consolidated_ancestors_branches,
                 'indi_branch_consolidated',
-                function (JoinClause $join) use ($gen): void {
+                function(JoinClause $join) use ($gen): void {
                     $join->where('maj_sosa.majs_gedcom_id', '=', $this->tree->id())
                         ->where('maj_sosa.majs_user_id', '=', $this->user->id())
                         ->where('branches', '>', 0)