jon48 / webtrees-lib

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaStatistics.php

Indentation +107 added lines, -107 removed lines

@@ -34,125 +34,125 @@
  */
 class SosaStatistics implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
     
-    /**
-     * @var SosaModule $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule $module
+	 */
+	private $module;
     
-    /**
-     * Constructor for AncestorsList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for AncestorsList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service
+	) {
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
         
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
         
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+		$user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
         
-        /** @var SosaStatisticsService $sosa_stats_service */
-        $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
+		/** @var SosaStatisticsService $sosa_stats_service */
+		$sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
         
-        return $this->viewResponse($this->module->name() . '::statistics-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Statistics'),
-            'tree'              =>  $tree,
-            'theme'             =>  app(ModuleThemeInterface::class),
-            'root_indi'         =>  $sosa_stats_service->rootIndividual(),
-            'general_stats'     =>  $this->statisticsGeneral($sosa_stats_service),
-            'generation_stats'  =>  $this->statisticsByGenerations($sosa_stats_service),
-            'generation_depth'  =>  $sosa_stats_service->generationDepthStatsAtGeneration(1)->first(),
-            'multiple_sosas'    =>  $sosa_stats_service->topMultipleAncestorsWithNoTies(10)->groupBy('sosa_count'),
-            'sosa_dispersion_g2'=>  $sosa_stats_service->ancestorsDispersionForGeneration(2),
-            'sosa_dispersion_g3'=>  $sosa_stats_service->ancestorsDispersionForGeneration(3),
-            'gen_depth_g3'      =>  $sosa_stats_service->generationDepthStatsAtGeneration(3)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::statistics-page', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Statistics'),
+			'tree'              =>  $tree,
+			'theme'             =>  app(ModuleThemeInterface::class),
+			'root_indi'         =>  $sosa_stats_service->rootIndividual(),
+			'general_stats'     =>  $this->statisticsGeneral($sosa_stats_service),
+			'generation_stats'  =>  $this->statisticsByGenerations($sosa_stats_service),
+			'generation_depth'  =>  $sosa_stats_service->generationDepthStatsAtGeneration(1)->first(),
+			'multiple_sosas'    =>  $sosa_stats_service->topMultipleAncestorsWithNoTies(10)->groupBy('sosa_count'),
+			'sosa_dispersion_g2'=>  $sosa_stats_service->ancestorsDispersionForGeneration(2),
+			'sosa_dispersion_g3'=>  $sosa_stats_service->ancestorsDispersionForGeneration(3),
+			'gen_depth_g3'      =>  $sosa_stats_service->generationDepthStatsAtGeneration(3)
+		]);
+	}
     
-    /**
-     * Retrieve and compute the global statistics of ancestors for the tree.
-     * Statistics include the number of ancestors, the number of different ancestors, pedigree collapse...
-     * 
-     * @param SosaStatisticsService sosa_stats_service
-     * @return array<string, int|float>
-     */
-    private function statisticsGeneral(SosaStatisticsService $sosa_stats_service) : array
-    {
-        $ancestors_count = $sosa_stats_service->totalAncestors();
-        $ancestors_distinct_count = $sosa_stats_service->totalDistinctAncestors();
-        $individual_count = $sosa_stats_service->totalIndividuals();
+	/**
+	 * Retrieve and compute the global statistics of ancestors for the tree.
+	 * Statistics include the number of ancestors, the number of different ancestors, pedigree collapse...
+	 * 
+	 * @param SosaStatisticsService sosa_stats_service
+	 * @return array<string, int|float>
+	 */
+	private function statisticsGeneral(SosaStatisticsService $sosa_stats_service) : array
+	{
+		$ancestors_count = $sosa_stats_service->totalAncestors();
+		$ancestors_distinct_count = $sosa_stats_service->totalDistinctAncestors();
+		$individual_count = $sosa_stats_service->totalIndividuals();
         
-        return [
-            'sosa_count'            =>  $ancestors_count,
-            'distinct_count'        =>  $ancestors_distinct_count,
-            'sosa_rate'             =>  $this->safeDivision($ancestors_distinct_count, $individual_count),
-            'pedi_collapse'         =>  1 - $this->safeDivision($ancestors_distinct_count, $ancestors_count),
-            'mean_gen_time'         =>  $sosa_stats_service->meanGenerationTime()
-        ];
-    }
+		return [
+			'sosa_count'            =>  $ancestors_count,
+			'distinct_count'        =>  $ancestors_distinct_count,
+			'sosa_rate'             =>  $this->safeDivision($ancestors_distinct_count, $individual_count),
+			'pedi_collapse'         =>  1 - $this->safeDivision($ancestors_distinct_count, $ancestors_count),
+			'mean_gen_time'         =>  $sosa_stats_service->meanGenerationTime()
+		];
+	}
     
-    /**
-     * Retrieve and compute the statistics of ancestors by generations.
-     * Statistics include the number of ancestors, the number of different ancestors, cumulative statistics...
-     * 
-     * @param SosaStatisticsService $sosa_stats_service
-     * @return array<int, array<string, int|float>
-     */
-    private function statisticsByGenerations(SosaStatisticsService $sosa_stats_service) : array
-    {
-        $stats_by_gen = $sosa_stats_service->statisticsByGenerations();
+	/**
+	 * Retrieve and compute the statistics of ancestors by generations.
+	 * Statistics include the number of ancestors, the number of different ancestors, cumulative statistics...
+	 * 
+	 * @param SosaStatisticsService $sosa_stats_service
+	 * @return array<int, array<string, int|float>
+	 */
+	private function statisticsByGenerations(SosaStatisticsService $sosa_stats_service) : array
+	{
+		$stats_by_gen = $sosa_stats_service->statisticsByGenerations();
         
-        $generation_stats = array();
+		$generation_stats = array();
         
-        foreach($stats_by_gen as $gen => $stats_gen){
-            $gen_diff = $gen > 1 ?$stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
-            $generation_stats[$gen] = array(
-                'gen_min_birth' => $stats_gen['firstBirth'] ?? $stats_gen['firstEstimatedBirth'],
-                'gen_max_birth' => $stats_gen['lastBirth'] ?? $stats_gen['lastEstimatedBirth'],
-                'theoretical' => pow(2, $gen - 1),
-                'known' => $stats_gen['sosaCount'],
-                'perc_known' => $this->safeDivision($stats_gen['sosaCount'], pow(2, $gen - 1)),
-                'missing' => $gen > 1 ? 2 * $stats_by_gen[$gen - 1]['sosaCount'] - $stats_gen['sosaCount'] : 0,
-                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'],  2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
-                'total_known' => $stats_gen['sosaTotalCount'],
-                'perc_total_known' => $this->safeDivision($stats_gen['sosaTotalCount'], pow(2, $gen) - 1),
-                'different' => $gen_diff,
-                'perc_different' => $this->safeDivision($gen_diff, $stats_gen['sosaCount']),
-                'total_different' => $stats_gen['diffSosaTotalCount'],
-                'pedi_collapse' => 1 - $this->safeDivision($stats_gen['diffSosaTotalCount'], $stats_gen['sosaTotalCount'])
-            );
-        }
+		foreach($stats_by_gen as $gen => $stats_gen){
+			$gen_diff = $gen > 1 ?$stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
+			$generation_stats[$gen] = array(
+				'gen_min_birth' => $stats_gen['firstBirth'] ?? $stats_gen['firstEstimatedBirth'],
+				'gen_max_birth' => $stats_gen['lastBirth'] ?? $stats_gen['lastEstimatedBirth'],
+				'theoretical' => pow(2, $gen - 1),
+				'known' => $stats_gen['sosaCount'],
+				'perc_known' => $this->safeDivision($stats_gen['sosaCount'], pow(2, $gen - 1)),
+				'missing' => $gen > 1 ? 2 * $stats_by_gen[$gen - 1]['sosaCount'] - $stats_gen['sosaCount'] : 0,
+				'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'],  2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
+				'total_known' => $stats_gen['sosaTotalCount'],
+				'perc_total_known' => $this->safeDivision($stats_gen['sosaTotalCount'], pow(2, $gen) - 1),
+				'different' => $gen_diff,
+				'perc_different' => $this->safeDivision($gen_diff, $stats_gen['sosaCount']),
+				'total_different' => $stats_gen['diffSosaTotalCount'],
+				'pedi_collapse' => 1 - $this->safeDivision($stats_gen['diffSosaTotalCount'], $stats_gen['sosaTotalCount'])
+			);
+		}
         
-        return $generation_stats;
-    }
+		return $generation_stats;
+	}
     
-    /**
-     * Return the result of a division, and a default value if denominator is 0
-     * 
-     * @param int $p Numerator
-     * @param int $q Denominator
-     * @param float $default Value if denominator is 0
-     * @return float
-     */
-    private function safeDivision(int $p, int $q, float $default = 0) : float
-    {
-        return $q == 0 ? $default : $p / $q;
-    }
+	/**
+	 * Return the result of a division, and a default value if denominator is 0
+	 * 
+	 * @param int $p Numerator
+	 * @param int $q Denominator
+	 * @param float $default Value if denominator is 0
+	 * @return float
+	 */
+	private function safeDivision(int $p, int $q, float $default = 0) : float
+	{
+		return $q == 0 ? $default : $p / $q;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
         
-        return $this->viewResponse($this->module->name() . '::statistics-page', [
+        return $this->viewResponse($this->module->name().'::statistics-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Statistics'),
             'tree'              =>  $tree,
@@ -121,8 +121,8 @@ 
         
         $generation_stats = array();
         
-        foreach($stats_by_gen as $gen => $stats_gen){
-            $gen_diff = $gen > 1 ?$stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
+        foreach ($stats_by_gen as $gen => $stats_gen) {
+            $gen_diff = $gen > 1 ? $stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
             $generation_stats[$gen] = array(
                 'gen_min_birth' => $stats_gen['firstBirth'] ?? $stats_gen['firstEstimatedBirth'],
                 'gen_max_birth' => $stats_gen['lastBirth'] ?? $stats_gen['lastEstimatedBirth'],
@@ -130,7 +130,7 @@ 
                 'known' => $stats_gen['sosaCount'],
                 'perc_known' => $this->safeDivision($stats_gen['sosaCount'], pow(2, $gen - 1)),
                 'missing' => $gen > 1 ? 2 * $stats_by_gen[$gen - 1]['sosaCount'] - $stats_gen['sosaCount'] : 0,
-                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'],  2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
+                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'], 2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
                 'total_known' => $stats_gen['sosaTotalCount'],
                 'perc_total_known' => $this->safeDivision($stats_gen['sosaTotalCount'], pow(2, $gen) - 1),
                 'different' => $gen_diff,

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaComputeAction.php

Indentation +36 added lines, -36 removed lines

@@ -32,48 +32,48 @@
  */
 class SosaComputeAction implements RequestHandlerInterface
 {
-    /**
-     * @var UserService $user_service
-     */
-    private $user_service;
+	/**
+	 * @var UserService $user_service
+	 */
+	private $user_service;
     
-    /**
-     * Constructor for SosaConfigAction Request Handler
-     * 
-     * @param UserService $user_service
-     */
-    public function __construct(UserService $user_service)
-    {
-        $this->user_service = $user_service;
-    }
+	/**
+	 * Constructor for SosaConfigAction Request Handler
+	 * 
+	 * @param UserService $user_service
+	 */
+	public function __construct(UserService $user_service)
+	{
+		$this->user_service = $user_service;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
         
-        $user_id = (int) ($request->getParsedBody()['user_id'] ?? 0);
-        $partial_from = $request->getParsedBody()['partial_from'] ?? null;
+		$user_id = (int) ($request->getParsedBody()['user_id'] ?? 0);
+		$partial_from = $request->getParsedBody()['partial_from'] ?? null;
         
-        if(($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
-            $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
+		if(($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
+			$user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
             
-            /** @var SosaCalculatorService $sosa_calc_service */
-            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
+			/** @var SosaCalculatorService $sosa_calc_service */
+			$sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
             
-            if($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
-                $res = $sosa_calc_service->computeFromIndividual($sosa_from);
-            } else {
-                $res = $sosa_calc_service->computeAll();
-            }
+			if($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
+				$res = $sosa_calc_service->computeFromIndividual($sosa_from);
+			} else {
+				$res = $sosa_calc_service->computeAll();
+			}
             
-            return $res ? response('', 200) : response(I18N::translate('An error occurred during Sosa computation.'), 500);
+			return $res ? response('', 200) : response(I18N::translate('An error occurred during Sosa computation.'), 500);
             
-        }
-        throw new HttpAccessDeniedException(I18N::translate("You do not have permission to modify the user"));
-    }
+		}
+		throw new HttpAccessDeniedException(I18N::translate("You do not have permission to modify the user"));
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -56,16 +56,16 @@
         $tree = $request->getAttribute('tree');
         assert($tree instanceof Tree);
         
-        $user_id = (int) ($request->getParsedBody()['user_id'] ?? 0);
+        $user_id = (int)($request->getParsedBody()['user_id'] ?? 0);
         $partial_from = $request->getParsedBody()['partial_from'] ?? null;
         
-        if(($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
+        if (($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
             $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
             
             /** @var SosaCalculatorService $sosa_calc_service */
-            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
+            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, ['tree' => $tree, 'user' => $user]);
             
-            if($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
+            if ($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
                 $res = $sosa_calc_service->computeFromIndividual($sosa_from);
             } else {
                 $res = $sosa_calc_service->computeAll();

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaConfig.php

Indentation +47 added lines, -47 removed lines

@@ -32,58 +32,58 @@
  */
 class SosaConfig implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
     
-    /**
-     * @var SosaModule $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule $module
+	 */
+	private $module;
     
-    /**
-     * Constructor for SosaConfig Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for SosaConfig Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service
+	) {
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
         
-        /** @var Tree $tree */
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		/** @var Tree $tree */
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
         
-        $users_root = array();
-        if(Auth::check()) {
-            /** @var \Fisharebest\Webtrees\User $user */
-            $user = Auth::user();
-            $users_root[] = ['user' => $user, 'root_id' => $tree->getUserPreference($user, 'MAJ_SOSA_ROOT_ID')];
+		$users_root = array();
+		if(Auth::check()) {
+			/** @var \Fisharebest\Webtrees\User $user */
+			$user = Auth::user();
+			$users_root[] = ['user' => $user, 'root_id' => $tree->getUserPreference($user, 'MAJ_SOSA_ROOT_ID')];
             
-            if(Auth::isManager($tree)) {
-                $default_user = new DefaultUser();
-                $users_root[] = ['user' => $default_user, 'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID')];
-            }
-        }
+			if(Auth::isManager($tree)) {
+				$default_user = new DefaultUser();
+				$users_root[] = ['user' => $default_user, 'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID')];
+			}
+		}
         
-        return $this->viewResponse($this->module->name() . '::config-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Configuration'),
-            'tree'              =>  $tree,
-            'user_id'           =>  $request->getAttribute('user'),
-            'selected_user_id'  =>  (int) ($request->getQueryParams()['user_id'] ?? 0),
-            'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
-            'users_root'        =>  $users_root
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::config-page', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Configuration'),
+			'tree'              =>  $tree,
+			'user_id'           =>  $request->getAttribute('user'),
+			'selected_user_id'  =>  (int) ($request->getQueryParams()['user_id'] ?? 0),
+			'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
+			'users_root'        =>  $users_root
+		]);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -65,23 +65,23 @@
         assert($tree instanceof Tree);
         
         $users_root = array();
-        if(Auth::check()) {
+        if (Auth::check()) {
             /** @var \Fisharebest\Webtrees\User $user */
             $user = Auth::user();
             $users_root[] = ['user' => $user, 'root_id' => $tree->getUserPreference($user, 'MAJ_SOSA_ROOT_ID')];
             
-            if(Auth::isManager($tree)) {
+            if (Auth::isManager($tree)) {
                 $default_user = new DefaultUser();
                 $users_root[] = ['user' => $default_user, 'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID')];
             }
         }
         
-        return $this->viewResponse($this->module->name() . '::config-page', [
+        return $this->viewResponse($this->module->name().'::config-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Configuration'),
             'tree'              =>  $tree,
             'user_id'           =>  $request->getAttribute('user'),
-            'selected_user_id'  =>  (int) ($request->getQueryParams()['user_id'] ?? 0),
+            'selected_user_id'  =>  (int)($request->getQueryParams()['user_id'] ?? 0),
             'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
             'users_root'        =>  $users_root
         ]);

src/Webtrees/Module/Sosa/Schema/Migration1.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
 class Migration1 implements MigrationInterface
 {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        // These migrations have been merged into migration 2.
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		// These migrations have been merged into migration 2.
+	}
 }

src/Webtrees/Module/Sosa/Schema/Migration0.php

Indentation +5 added lines, -5 removed lines

@@ -22,12 +22,12 @@
 class Migration0 implements MigrationInterface
 {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
 	public function upgrade(): void
 	{
-	    // These migrations have been merged into migration 2.
+		// These migrations have been merged into migration 2.
 	}
 }

src/Webtrees/Module/Sosa/Schema/Migration2.php

Indentation +23 added lines, -23 removed lines

@@ -23,36 +23,36 @@
  */
 class Migration2 implements MigrationInterface {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
 	public function upgrade(): void
 	{
 	    
-	    // Clean up previous sosa table if it exists
-	    DB::schema()->dropIfExists('maj_sosa');
+		// Clean up previous sosa table if it exists
+		DB::schema()->dropIfExists('maj_sosa');
 	    
-	    DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
+		DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
 	        
-	        $table->integer('majs_gedcom_id');
-	        $table->integer('majs_user_id')->default(-1);
-	        $table->bigInteger('majs_sosa')->unsigned(); // Allow to calculate sosa on 64 generations
-	        $table->string('majs_i_id', 20);
-	        $table->tinyInteger('majs_gen')->nullable();
-	        $table->smallInteger('majs_birth_year')->nullable();
-	        $table->smallInteger('majs_birth_year_est')->nullable();
-	        $table->smallInteger('majs_death_year')->nullable();
-	        $table->smallInteger('majs_death_year_est')->nullable();
+			$table->integer('majs_gedcom_id');
+			$table->integer('majs_user_id')->default(-1);
+			$table->bigInteger('majs_sosa')->unsigned(); // Allow to calculate sosa on 64 generations
+			$table->string('majs_i_id', 20);
+			$table->tinyInteger('majs_gen')->nullable();
+			$table->smallInteger('majs_birth_year')->nullable();
+			$table->smallInteger('majs_birth_year_est')->nullable();
+			$table->smallInteger('majs_death_year')->nullable();
+			$table->smallInteger('majs_death_year_est')->nullable();
 	        
-	        $table->primary(['majs_gedcom_id', 'majs_user_id', 'majs_sosa']);
+			$table->primary(['majs_gedcom_id', 'majs_user_id', 'majs_sosa']);
 	        
-	        $table->index(['majs_gedcom_id', 'majs_user_id']);
-	        $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_i_id']);
-	        $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_gen']);
+			$table->index(['majs_gedcom_id', 'majs_user_id']);
+			$table->index(['majs_gedcom_id', 'majs_user_id', 'majs_i_id']);
+			$table->index(['majs_gedcom_id', 'majs_user_id', 'majs_gen']);
 	        
-	        $table->foreign('majs_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
-	        $table->foreign('majs_user_id')->references('user_id')->on('user')->onDelete('cascade');
-	    });
+			$table->foreign('majs_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
+			$table->foreign('majs_user_id')->references('user_id')->on('user')->onDelete('cascade');
+		});
 	}
 }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	    // Clean up previous sosa table if it exists
 	    DB::schema()->dropIfExists('maj_sosa');
 	    
-	    DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
+	    DB::schema()->create('maj_sosa', static function(Blueprint $table): void {
 	        
 	        $table->integer('majs_gedcom_id');
 	        $table->integer('majs_user_id')->default(-1);

src/Webtrees/Module/Sosa/Services/SosaRecordsService.php

Indentation +118 added lines, -118 removed lines

@@ -26,130 +26,130 @@
  */
 class SosaRecordsService
 {
-    /**
-     * Maximum number of generation the database is able to hold.
-     * @var int MAX_DB_GENERATIONS
-     */
-    public const MAX_DB_GENERATIONS = 64;
+	/**
+	 * Maximum number of generation the database is able to hold.
+	 * @var int MAX_DB_GENERATIONS
+	 */
+	public const MAX_DB_GENERATIONS = 64;
     
-    /**
-     * Calculate the generation of a sosa
-     * Sosa 1 is of generation 1.
-     *
-     * @param int $sosa
-     * @return int
-     */
-    public function generation(int $sosa) : int
-    {
-        return (int) log($sosa, 2) + 1;
-    }
+	/**
+	 * Calculate the generation of a sosa
+	 * Sosa 1 is of generation 1.
+	 *
+	 * @param int $sosa
+	 * @return int
+	 */
+	public function generation(int $sosa) : int
+	{
+		return (int) log($sosa, 2) + 1;
+	}
     
-    /**
-     * Returns all Sosa numbers associated to an Individual
-     * 
-     * @param Tree $tree
-     * @param User $user
-     * @param Individual $indi
-     * @return Collection
-     */
-    public function getSosaNumbers(Tree $tree, User $user, Individual $indi) : Collection
-    {
-        return DB::table('maj_sosa')
-            ->select(['majs_sosa', 'majs_gen'])
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->where('majs_i_id', '=', $indi->xref())
-            ->get()->pluck('majs_gen', 'majs_sosa');
-    }
+	/**
+	 * Returns all Sosa numbers associated to an Individual
+	 * 
+	 * @param Tree $tree
+	 * @param User $user
+	 * @param Individual $indi
+	 * @return Collection
+	 */
+	public function getSosaNumbers(Tree $tree, User $user, Individual $indi) : Collection
+	{
+		return DB::table('maj_sosa')
+			->select(['majs_sosa', 'majs_gen'])
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->where('majs_i_id', '=', $indi->xref())
+			->get()->pluck('majs_gen', 'majs_sosa');
+	}
     
-    /**
-     * Remove all Sosa entries related to the gedcom file and user
-     * 
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function deleteAll(Tree $tree, User $user) : void
-    {
-        DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->delete();
-    }
+	/**
+	 * Remove all Sosa entries related to the gedcom file and user
+	 * 
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function deleteAll(Tree $tree, User $user) : void
+	{
+		DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->delete();
+	}
     
-    /**
-     * 
-     * @param Tree $tree
-     * @param User $user
-     * @param int $sosa
-     */
-    public function deleteAncestorsFrom(Tree $tree, User $user, int $sosa) : void
-    {
-        DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->where('majs_sosa', '>=', $sosa)
-            ->whereRaw(
-                'FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa',
-                ['gen' => $this->generation($sosa), 'sosa' => $sosa])
-            ->delete();
-    }
+	/**
+	 * 
+	 * @param Tree $tree
+	 * @param User $user
+	 * @param int $sosa
+	 */
+	public function deleteAncestorsFrom(Tree $tree, User $user, int $sosa) : void
+	{
+		DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->where('majs_sosa', '>=', $sosa)
+			->whereRaw(
+				'FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa',
+				['gen' => $this->generation($sosa), 'sosa' => $sosa])
+			->delete();
+	}
     
-    /**
-     * Insert (or update if already existing) a list of Sosa individuals
-     * 
-     * @param Tree $tree
-     * @param User $user
-     * @param array $sosa_records
-     */
-    public function insertOrUpdate(Tree $tree, User $user, array $sosa_records) {
-        $mass_update = DB::connection()->getDriverName() === 'mysql';
+	/**
+	 * Insert (or update if already existing) a list of Sosa individuals
+	 * 
+	 * @param Tree $tree
+	 * @param User $user
+	 * @param array $sosa_records
+	 */
+	public function insertOrUpdate(Tree $tree, User $user, array $sosa_records) {
+		$mass_update = DB::connection()->getDriverName() === 'mysql';
         
-        $bindings_placeholders = $bindings_values = [];
-        foreach($sosa_records as $i => $row) {
-            $gen = $this->generation($row['sosa']);
-            if($gen <=  self::MAX_DB_GENERATIONS) {
-                if($mass_update) {
-                    $bindings_placeholders[] = '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.','.
-                        ' :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
-                    $bindings_values = array_merge(
-                        $bindings_values,
-                        [
-                            'tree_id'.$i => $tree->id(),
-                            'user_id'.$i => $user->id(),
-                            'sosa'.$i => $row['sosa'],
-                            'indi_id'.$i => $row['indi'],
-                            'gen'.$i => $gen,
-                            'byear'.$i => $row['birth_year'],
-                            'byearest'.$i => $row['birth_year_est'],
-                            'dyear'.$i => $row['death_year'],
-                            'dyearest'.$i => $row['death_year_est']
-                        ]);
-                } else {
-                    DB::table('maj_sosa')->updateOrInsert(
-                        [ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
-                        [
-                            'majs_i_id' => $row['indi'],
-                            'majs_gen' => $gen,
-                            'majs_birth_year' => $row['birth_year'],
-                            'majs_birth_year_est' => $row['birth_year_est'],
-                            'majs_death_year' => $row['death_year'],
-                            'majs_death_year_est' => $row['death_year_est']
-                        ]);
-                }
-            }
-        }
+		$bindings_placeholders = $bindings_values = [];
+		foreach($sosa_records as $i => $row) {
+			$gen = $this->generation($row['sosa']);
+			if($gen <=  self::MAX_DB_GENERATIONS) {
+				if($mass_update) {
+					$bindings_placeholders[] = '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.','.
+						' :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
+					$bindings_values = array_merge(
+						$bindings_values,
+						[
+							'tree_id'.$i => $tree->id(),
+							'user_id'.$i => $user->id(),
+							'sosa'.$i => $row['sosa'],
+							'indi_id'.$i => $row['indi'],
+							'gen'.$i => $gen,
+							'byear'.$i => $row['birth_year'],
+							'byearest'.$i => $row['birth_year_est'],
+							'dyear'.$i => $row['death_year'],
+							'dyearest'.$i => $row['death_year_est']
+						]);
+				} else {
+					DB::table('maj_sosa')->updateOrInsert(
+						[ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
+						[
+							'majs_i_id' => $row['indi'],
+							'majs_gen' => $gen,
+							'majs_birth_year' => $row['birth_year'],
+							'majs_birth_year_est' => $row['birth_year_est'],
+							'majs_death_year' => $row['death_year'],
+							'majs_death_year_est' => $row['death_year_est']
+						]);
+				}
+			}
+		}
         
-        if($mass_update) {
-            DB::connection()->statement(
-                'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
-                ' (majs_gedcom_id, majs_user_id, majs_sosa,' .
-                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
-                ' VALUES ' . implode(',', $bindings_placeholders) .
-                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
-                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' . 
-                '   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
-                $bindings_values);
-        }
-    }
+		if($mass_update) {
+			DB::connection()->statement(
+				'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
+				' (majs_gedcom_id, majs_user_id, majs_sosa,' .
+				'   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
+				' VALUES ' . implode(',', $bindings_placeholders) .
+				' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
+				'   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' . 
+				'   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
+				$bindings_values);
+		}
+	}
     
 }

Spacing +12 added lines, -12 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function generation(int $sosa) : int
     {
-        return (int) log($sosa, 2) + 1;
+        return (int)log($sosa, 2) + 1;
     }
     
     /**
@@ -105,10 +105,10 @@ 
         $mass_update = DB::connection()->getDriverName() === 'mysql';
         
         $bindings_placeholders = $bindings_values = [];
-        foreach($sosa_records as $i => $row) {
+        foreach ($sosa_records as $i => $row) {
             $gen = $this->generation($row['sosa']);
-            if($gen <=  self::MAX_DB_GENERATIONS) {
-                if($mass_update) {
+            if ($gen <= self::MAX_DB_GENERATIONS) {
+                if ($mass_update) {
                     $bindings_placeholders[] = '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.','.
                         ' :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
                     $bindings_values = array_merge(
@@ -126,7 +126,7 @@ 
                         ]);
                 } else {
                     DB::table('maj_sosa')->updateOrInsert(
-                        [ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
+                        ['majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
                         [
                             'majs_i_id' => $row['indi'],
                             'majs_gen' => $gen,
@@ -139,14 +139,14 @@ 
             }
         }
         
-        if($mass_update) {
+        if ($mass_update) {
             DB::connection()->statement(
-                'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
-                ' (majs_gedcom_id, majs_user_id, majs_sosa,' .
-                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
-                ' VALUES ' . implode(',', $bindings_placeholders) .
-                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
-                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' . 
+                'INSERT INTO `'.DB::connection()->getTablePrefix().'maj_sosa`'.
+                ' (majs_gedcom_id, majs_user_id, majs_sosa,'.
+                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)'.
+                ' VALUES '.implode(',', $bindings_placeholders).
+                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),'.
+                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),'. 
                 '   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
                 $bindings_values);
         }

src/Webtrees/Module/Sosa/Services/SosaStatisticsService.php

Indentation +311 added lines, -311 removed lines

@@ -30,337 +30,337 @@
 class SosaStatisticsService
 {
     
-    /**
-     * Reference user
-     * @var User $user
-     */
-    private $user;
+	/**
+	 * Reference user
+	 * @var User $user
+	 */
+	private $user;
     
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    private $tree;
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	private $tree;
     
-    /**
-     * Constructor for Sosa Statistics Service
-     * 
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function __construct(Tree $tree, User $user)
-    {
-        $this->tree = $tree;
-        $this->user = $user;
-    }
+	/**
+	 * Constructor for Sosa Statistics Service
+	 * 
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function __construct(Tree $tree, User $user)
+	{
+		$this->tree = $tree;
+		$this->user = $user;
+	}
     
-    /**
-     * Return the root individual for the reference tree and user.
-     * 
-     * @return Individual|NULL
-     */
-    public function rootIndividual() : ?Individual
-    {
-        $root_indi_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-        return Registry::individualFactory()->make($root_indi_id, $this->tree);
-    }
+	/**
+	 * Return the root individual for the reference tree and user.
+	 * 
+	 * @return Individual|NULL
+	 */
+	public function rootIndividual() : ?Individual
+	{
+		$root_indi_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
+		return Registry::individualFactory()->make($root_indi_id, $this->tree);
+	}
     
-    /**
-     * Returns how many individuals exist in the tree.
-     *
-     * @return int
-     */
-    public function totalIndividuals(): int
-    {
-        return DB::table('individuals')
-            ->where('i_file', '=', $this->tree->id())
-            ->count();
-    }
+	/**
+	 * Returns how many individuals exist in the tree.
+	 *
+	 * @return int
+	 */
+	public function totalIndividuals(): int
+	{
+		return DB::table('individuals')
+			->where('i_file', '=', $this->tree->id())
+			->count();
+	}
     
-    /**
-     * Get the total count of Sosa ancestors for all generations
-     * 
-     * @return int
-     */
-    public function totalAncestors() : int
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->count();
-    }
+	/**
+	 * Get the total count of Sosa ancestors for all generations
+	 * 
+	 * @return int
+	 */
+	public function totalAncestors() : int
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->count();
+	}
     
-    /**
-     * Get the total count of distinct Sosa ancestors for all generations
-     * 
-     * @return int
-     */
-    public function totalDistinctAncestors() : int
-    {
-        return DB::table('maj_sosa')
-        ->where('majs_gedcom_id', '=', $this->tree->id())
-        ->where('majs_user_id', '=', $this->user->id())
-        ->distinct()
-        ->count('majs_i_id');
-    }
+	/**
+	 * Get the total count of distinct Sosa ancestors for all generations
+	 * 
+	 * @return int
+	 */
+	public function totalDistinctAncestors() : int
+	{
+		return DB::table('maj_sosa')
+		->where('majs_gedcom_id', '=', $this->tree->id())
+		->where('majs_user_id', '=', $this->user->id())
+		->distinct()
+		->count('majs_i_id');
+	}
     
-    /**
-     * Get the mean generation time, as the slope of the linear regression of birth years vs generations
-     * 
-     * @return float
-     */
-    public function meanGenerationTime() : float
-    {
-        $row = DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->whereNotNull('majs_birth_year')
-            ->selectRaw('COUNT(majs_sosa) AS n')
-            ->selectRaw('SUM(majs_gen * majs_birth_year) AS sum_xy')
-            ->selectRaw('SUM(majs_gen) AS sum_x')
-            ->selectRaw('SUM(majs_birth_year) AS sum_y')
-            ->selectRaw('SUM(majs_gen * majs_gen) AS sum_x2')
-            ->get()->first();
+	/**
+	 * Get the mean generation time, as the slope of the linear regression of birth years vs generations
+	 * 
+	 * @return float
+	 */
+	public function meanGenerationTime() : float
+	{
+		$row = DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->whereNotNull('majs_birth_year')
+			->selectRaw('COUNT(majs_sosa) AS n')
+			->selectRaw('SUM(majs_gen * majs_birth_year) AS sum_xy')
+			->selectRaw('SUM(majs_gen) AS sum_x')
+			->selectRaw('SUM(majs_birth_year) AS sum_y')
+			->selectRaw('SUM(majs_gen * majs_gen) AS sum_x2')
+			->get()->first();
         
-        return $row->n == 0 ? 0 :
-            -($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / ($row->n * $row->sum_x2 - pow($row->sum_x, 2));
-    }
+		return $row->n == 0 ? 0 :
+			-($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / ($row->n * $row->sum_x2 - pow($row->sum_x, 2));
+	}
     
-    /**
-     * Get the statistic array detailed by generation.
-     * Statistics for each generation are:
-     * 	- The number of Sosa in generation
-     * 	- The number of Sosa up to generation
-     *  - The number of distinct Sosa up to generation
-     *  - The year of the first birth in generation
-     *  - The year of the first estimated birth in generation
-     *  - The year of the last birth in generation
-     *  - The year of the last estimated birth in generation
-     *  - The average year of birth in generation
-     *
-     * @return array Statistics array
-     */
-    public function statisticsByGenerations() : array
-    {
-        $stats_by_gen = $this->statisticsByGenerationBasicData();
-        $cumul_stats_by_gen = $this->statisticsByGenerationCumulativeData();
+	/**
+	 * Get the statistic array detailed by generation.
+	 * Statistics for each generation are:
+	 * 	- The number of Sosa in generation
+	 * 	- The number of Sosa up to generation
+	 *  - The number of distinct Sosa up to generation
+	 *  - The year of the first birth in generation
+	 *  - The year of the first estimated birth in generation
+	 *  - The year of the last birth in generation
+	 *  - The year of the last estimated birth in generation
+	 *  - The average year of birth in generation
+	 *
+	 * @return array Statistics array
+	 */
+	public function statisticsByGenerations() : array
+	{
+		$stats_by_gen = $this->statisticsByGenerationBasicData();
+		$cumul_stats_by_gen = $this->statisticsByGenerationCumulativeData();
         
-        $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,
-                'firstBirth'			=>	$stats_gen->first_year,
-                'firstEstimatedBirth'	=>	$stats_gen->first_est_year,
-                'lastBirth'				=>	$stats_gen->last_year,
-                'lastEstimatedBirth'	=>	$stats_gen->last_est_year
-            );
-        }
+		$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,
+				'firstBirth'			=>	$stats_gen->first_year,
+				'firstEstimatedBirth'	=>	$stats_gen->first_est_year,
+				'lastBirth'				=>	$stats_gen->last_year,
+				'lastEstimatedBirth'	=>	$stats_gen->last_est_year
+			);
+		}
         
-        return $statistics_by_gen;
-    }
+		return $statistics_by_gen;
+	}
     
-    /**
-     * Returns the basic statistics data by generation.
-     * 
-     * @return Collection
-     */
-    private function statisticsByGenerationBasicData() : Collection
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->groupBy('majs_gen')
-            ->orderBy('majs_gen', 'asc')
-            ->select('majs_gen AS gen')
-            ->selectRaw('COUNT(majs_sosa) AS total_sosa')
-            ->selectRaw('MIN(majs_birth_year) AS first_year')
-            ->selectRaw('MIN(majs_birth_year_est) AS first_est_year')
-            ->selectRaw('MAX(majs_birth_year) AS last_year')
-            ->selectRaw('MAX(majs_birth_year_est) AS last_est_year')
-            ->get()->keyBy('gen');
-    }
+	/**
+	 * Returns the basic statistics data by generation.
+	 * 
+	 * @return Collection
+	 */
+	private function statisticsByGenerationBasicData() : Collection
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->groupBy('majs_gen')
+			->orderBy('majs_gen', 'asc')
+			->select('majs_gen AS gen')
+			->selectRaw('COUNT(majs_sosa) AS total_sosa')
+			->selectRaw('MIN(majs_birth_year) AS first_year')
+			->selectRaw('MIN(majs_birth_year_est) AS first_est_year')
+			->selectRaw('MAX(majs_birth_year) AS last_year')
+			->selectRaw('MAX(majs_birth_year_est) AS last_est_year')
+			->get()->keyBy('gen');
+	}
     
-    /**
-     * Returns the cumulative statistics data by generation
-     * 
-     * @return Collection
-     */
-    private function statisticsByGenerationCumulativeData() : Collection
-    {
-        $list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id());
+	/**
+	 * Returns the cumulative statistics data by generation
+	 * 
+	 * @return Collection
+	 */
+	private function statisticsByGenerationCumulativeData() : Collection
+	{
+		$list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id());
         
-        return DB::table('maj_sosa')
-            ->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());
-            })
-            ->groupBy('list_gen.majs_gen')
-            ->select('list_gen.majs_gen AS gen')
-            ->selectRaw('COUNT(majs_i_id) AS total_cumul')
-            ->selectRaw('COUNT(DISTINCT majs_i_id) AS total_distinct_cumul')
-            ->get()->keyBy('gen');
-    }
+		return DB::table('maj_sosa')
+			->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());
+			})
+			->groupBy('list_gen.majs_gen')
+			->select('list_gen.majs_gen AS gen')
+			->selectRaw('COUNT(majs_i_id) AS total_cumul')
+			->selectRaw('COUNT(DISTINCT majs_i_id) AS total_distinct_cumul')
+			->get()->keyBy('gen');
+	}
     
-    /**
-     * Return a Collection of the mean generation depth and standard deviation for all Sosa ancestors at a given generation.
-     * Sosa 1 is of generation 1.
-     *
-     * Mean generation depth and deviation are calculated based on the works of Marie-Héléne Cazes and Pierre Cazes,
-     * published in Population (French Edition), Vol. 51, No. 1 (Jan. - Feb., 1996), pp. 117-140
-     * http://kintip.net/index.php?option=com_jdownloads&task=download.send&id=9&catid=4&m=0
-     *
-     * Format:
-     *  - key : sosa number of the ancestor
-     *  - values: 
-     *      - root_ancestor_id : ID of the ancestor
-     *      - mean_gen_depth : Mean generation depth
-     *      - stddev_gen_depth : Standard deviation of generation depth
-     *
-     * @param int $gen Sosa generation
-     * @return Collection
-     */
-    public function generationDepthStatsAtGeneration(int $gen) : Collection
-    {
-        $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])
-            ->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')
-            ->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')
-            ->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')
-                ->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 {    // Link to sosa's mother
-                $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 {
-                $query->whereNull('sosa_fat.majs_i_id')
-                    ->orWhereNull('sosa_mot.majs_i_id');
-            })
-            ->groupBy(['sosa.majs_gen', 'root_ancestor']);
+	/**
+	 * Return a Collection of the mean generation depth and standard deviation for all Sosa ancestors at a given generation.
+	 * Sosa 1 is of generation 1.
+	 *
+	 * Mean generation depth and deviation are calculated based on the works of Marie-Héléne Cazes and Pierre Cazes,
+	 * published in Population (French Edition), Vol. 51, No. 1 (Jan. - Feb., 1996), pp. 117-140
+	 * http://kintip.net/index.php?option=com_jdownloads&task=download.send&id=9&catid=4&m=0
+	 *
+	 * Format:
+	 *  - key : sosa number of the ancestor
+	 *  - values: 
+	 *      - root_ancestor_id : ID of the ancestor
+	 *      - mean_gen_depth : Mean generation depth
+	 *      - stddev_gen_depth : Standard deviation of generation depth
+	 *
+	 * @param int $gen Sosa generation
+	 * @return Collection
+	 */
+	public function generationDepthStatsAtGeneration(int $gen) : Collection
+	{
+		$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])
+			->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')
+			->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')
+			->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')
+				->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 {    // Link to sosa's mother
+				$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 {
+				$query->whereNull('sosa_fat.majs_i_id')
+					->orWhereNull('sosa_mot.majs_i_id');
+			})
+			->groupBy(['sosa.majs_gen', 'root_ancestor']);
 
-        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')
-            ->selectRaw(' SQRT('.
-                '   SUM(POWER(majs_gen_norm, 2) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm)))'.
-                '   - POWER( SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))), 2)'.
-                ' ) AS stddev_gen_depth')
-            ->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());
-            })
-            ->groupBy(['stats_by_gen.root_ancestor', 'sosa_list.majs_i_id'])
-            ->orderBy('stats_by_gen.root_ancestor')
-            ->get()->keyBy('root_ancestor_sosa');
-    }
+		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')
+			->selectRaw(' SQRT('.
+				'   SUM(POWER(majs_gen_norm, 2) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm)))'.
+				'   - POWER( SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))), 2)'.
+				' ) AS stddev_gen_depth')
+			->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());
+			})
+			->groupBy(['stats_by_gen.root_ancestor', 'sosa_list.majs_i_id'])
+			->orderBy('stats_by_gen.root_ancestor')
+			->get()->keyBy('root_ancestor_sosa');
+	}
     
-    /**
-     * Return a collection of the most duplicated root Sosa ancestors.
-     * The number of ancestors to return is limited by the parameter $limit.
-     * If several individuals are tied when reaching the limit, none of them are returned,
-     * which means that there can be less individuals returned than requested.
-     *
-     * Format:
-     *  - value:
-     *      - sosa_i_id : sosa individual
-     *      - sosa_count: number of duplications of the ancestor (e.g. 3 if it appears 3 times)
-     *
-     * @param int $limit
-     * @return Collection
-     */
-    public function topMultipleAncestorsWithNoTies(int $limit) : Collection
-    {
-        $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 {    // Link to sosa's father
-                $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 {    // Link to sosa's mother
-                $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())
-            ->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')
-            ->limit($limit + 1)     // We want to select one more than required, for ties
-            ->get();
+	/**
+	 * Return a collection of the most duplicated root Sosa ancestors.
+	 * The number of ancestors to return is limited by the parameter $limit.
+	 * If several individuals are tied when reaching the limit, none of them are returned,
+	 * which means that there can be less individuals returned than requested.
+	 *
+	 * Format:
+	 *  - value:
+	 *      - sosa_i_id : sosa individual
+	 *      - sosa_count: number of duplications of the ancestor (e.g. 3 if it appears 3 times)
+	 *
+	 * @param int $limit
+	 * @return Collection
+	 */
+	public function topMultipleAncestorsWithNoTies(int $limit) : Collection
+	{
+		$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 {    // Link to sosa's father
+				$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 {    // Link to sosa's mother
+				$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())
+			->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')
+			->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(function($element) use ($last_count) : bool {
-                return $element->sosa_count ==  $last_count;
-            });
-        }
-        return $multiple_ancestors;
-    }
+		if($multiple_ancestors->count() > $limit)
+		{
+			$last_count = $multiple_ancestors->last()->sosa_count;
+			$multiple_ancestors = $multiple_ancestors->reject(function($element) use ($last_count) : bool {
+				return $element->sosa_count ==  $last_count;
+			});
+		}
+		return $multiple_ancestors;
+	}
     
-    /**
-     * Return a computed array of statistics about the dispersion of ancestors across the ancestors
-     * at a specified generation.
-     * 
-     * Format: 
-     *  - key : rank of the ancestor in generation G for which exclusive ancestors have been found
-     *          For instance 3 represent the maternal grand father
-     *          0 is used for shared ancestors
-     *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
-     *  
-     *  For instance a result at generation 3 could be :
-     *      array (   0     =>  12      -> 12 ancestors are shared by the grand-parents
-     *                1     =>  32      -> 32 ancestors are exclusive to the paternal grand-father
-     *                2     =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
-     *                3     =>  12      -> 12 ancestors are exclusive to the maternal grand-father
-     *                4     =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
-     *            )
-     * 
-     * @param int $gen
-     * @return Collection
-     */
-    public function ancestorsDispersionForGeneration(int $gen) : Collection
-    {
-        $ancestors_branches = DB::table('maj_sosa')
-            ->select('majs_i_id AS i_id')
-            ->selectRaw('FLOOR(majs_sosa / POW(2, (majs_gen - ?))) - POW(2, ? -1) + 1 AS branch', [$gen, $gen])
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->where('majs_gen', '>=', $gen)
-            ->groupBy('majs_i_id', 'branch');
+	/**
+	 * Return a computed array of statistics about the dispersion of ancestors across the ancestors
+	 * at a specified generation.
+	 * 
+	 * Format: 
+	 *  - key : rank of the ancestor in generation G for which exclusive ancestors have been found
+	 *          For instance 3 represent the maternal grand father
+	 *          0 is used for shared ancestors
+	 *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
+	 *  
+	 *  For instance a result at generation 3 could be :
+	 *      array (   0     =>  12      -> 12 ancestors are shared by the grand-parents
+	 *                1     =>  32      -> 32 ancestors are exclusive to the paternal grand-father
+	 *                2     =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
+	 *                3     =>  12      -> 12 ancestors are exclusive to the maternal grand-father
+	 *                4     =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
+	 *            )
+	 * 
+	 * @param int $gen
+	 * @return Collection
+	 */
+	public function ancestorsDispersionForGeneration(int $gen) : Collection
+	{
+		$ancestors_branches = DB::table('maj_sosa')
+			->select('majs_i_id AS i_id')
+			->selectRaw('FLOOR(majs_sosa / POW(2, (majs_gen - ?))) - POW(2, ? -1) + 1 AS branch', [$gen, $gen])
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->where('majs_gen', '>=', $gen)
+			->groupBy('majs_i_id', 'branch');
         
             
-        $consolidated_ancestors_branches = DB::table('maj_sosa')
-            ->fromSub($ancestors_branches, 'indi_branch')
-            ->select('i_id')
-            ->selectRaw('CASE WHEN COUNT(branch) > 1 THEN 0 ELSE MIN(branch) END AS branches')
-            ->groupBy('i_id');
+		$consolidated_ancestors_branches = DB::table('maj_sosa')
+			->fromSub($ancestors_branches, 'indi_branch')
+			->select('i_id')
+			->selectRaw('CASE WHEN COUNT(branch) > 1 THEN 0 ELSE MIN(branch) END AS branches')
+			->groupBy('i_id');
             
-        return DB::table('maj_sosa')
-            ->fromSub($consolidated_ancestors_branches, 'indi_branch_consolidated')
-            ->select('branches')
-            ->selectRaw('COUNT(i_id) AS count_indi')
-            ->groupBy('branches')
-            ->get()->pluck('count_indi', 'branches');
-    }
+		return DB::table('maj_sosa')
+			->fromSub($consolidated_ancestors_branches, 'indi_branch_consolidated')
+			->select('branches')
+			->selectRaw('COUNT(i_id) AS count_indi')
+			->groupBy('branches')
+			->get()->pluck('count_indi', 'branches');
+	}
 }

Spacing +19 added lines, -20 removed lines

@@ -122,8 +122,7 @@ 
             ->selectRaw('SUM(majs_gen * majs_gen) AS sum_x2')
             ->get()->first();
         
-        return $row->n == 0 ? 0 :
-            -($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / ($row->n * $row->sum_x2 - pow($row->sum_x, 2));
+        return $row->n == 0 ? 0 : -($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / ($row->n * $row->sum_x2 - pow($row->sum_x, 2));
     }
     
     /**
@@ -146,11 +145,11 @@ 
         $cumul_stats_by_gen = $this->statisticsByGenerationCumulativeData();
         
         $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,
+        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,
                 'firstBirth'			=>	$stats_gen->first_year,
                 'firstEstimatedBirth'	=>	$stats_gen->first_est_year,
                 'lastBirth'				=>	$stats_gen->last_year,
@@ -228,17 +227,17 @@ 
     {
         $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])
-            ->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')
-            ->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')
+            ->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])
+            ->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')
+            ->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')
             ->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 {    // 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());
             })
@@ -287,14 +286,14 @@ 
         $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')
+            ->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 {    // 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());
             })
@@ -303,16 +302,16 @@ 
             ->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')
+            ->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')
             ->limit($limit + 1)     // We want to select one more than required, for ties
             ->get();
             
-        if($multiple_ancestors->count() > $limit)
+        if ($multiple_ancestors->count() > $limit)
         {
             $last_count = $multiple_ancestors->last()->sosa_count;
             $multiple_ancestors = $multiple_ancestors->reject(function($element) use ($last_count) : bool {
-                return $element->sosa_count ==  $last_count;
+                return $element->sosa_count == $last_count;
             });
         }
         return $multiple_ancestors;

src/Webtrees/Module/Sosa/Services/SosaCalculatorService.php

Indentation +109 added lines, -109 removed lines

@@ -25,126 +25,126 @@
  */
 class SosaCalculatorService
 {
-    /**
-     * Maximium size for the temporary Sosa table
-     * @var int TMP_SOSA_TABLE_LIMIT
-     */
-    private const TMP_SOSA_TABLE_LIMIT = 1000;
+	/**
+	 * Maximium size for the temporary Sosa table
+	 * @var int TMP_SOSA_TABLE_LIMIT
+	 */
+	private const TMP_SOSA_TABLE_LIMIT = 1000;
     
-    /**
-     * @var SosaRecordsService $sosa_records_service
-     */
-    private $sosa_records_service;
+	/**
+	 * @var SosaRecordsService $sosa_records_service
+	 */
+	private $sosa_records_service;
     
-    /**
-     * Reference user
-     * @var User $user
-     */
-    private $user;
+	/**
+	 * Reference user
+	 * @var User $user
+	 */
+	private $user;
     
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    private $tree;
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	private $tree;
     
-    /**
-     * Temporary Sosa table, used during construction
-     * @var array<string,mixed> $tmp_sosa_table
-     */
-    private $tmp_sosa_table;
+	/**
+	 * Temporary Sosa table, used during construction
+	 * @var array<string,mixed> $tmp_sosa_table
+	 */
+	private $tmp_sosa_table;
     
-    /**
-     * Constructor for the Sosa Calculator
-     * 
-     * @param SosaRecordsService $sosa_records_service
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function __construct(SosaRecordsService $sosa_records_service, Tree $tree, User $user)
-    {
-        $this->sosa_records_service = $sosa_records_service;
-        $this->tree = $tree;
-        $this->user = $user;
-        $this->tmp_sosa_table = array();
-    }
+	/**
+	 * Constructor for the Sosa Calculator
+	 * 
+	 * @param SosaRecordsService $sosa_records_service
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function __construct(SosaRecordsService $sosa_records_service, Tree $tree, User $user)
+	{
+		$this->sosa_records_service = $sosa_records_service;
+		$this->tree = $tree;
+		$this->user = $user;
+		$this->tmp_sosa_table = array();
+	}
     
-    /**
-     * Compute all Sosa ancestors from the user's root individual.
-     * 
-     * @return bool Result of the computation
-     */
-    public function computeAll(): bool
-    {
-        $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-        if($indi = Registry::individualFactory()->make($root_id, $this->tree)) {
-            $this->sosa_records_service->deleteAll($this->tree, $this->user);
-            $this->addNode($indi, 1);
-            $this->flushTmpSosaTable(true);
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * Compute all Sosa ancestors from the user's root individual.
+	 * 
+	 * @return bool Result of the computation
+	 */
+	public function computeAll(): bool
+	{
+		$root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
+		if($indi = Registry::individualFactory()->make($root_id, $this->tree)) {
+			$this->sosa_records_service->deleteAll($this->tree, $this->user);
+			$this->addNode($indi, 1);
+			$this->flushTmpSosaTable(true);
+			return true;
+		}
+		return false;
+	}
     
-    /**
-     * Compute all Sosa Ancestors from a specified Individual
-     * 
-     * @param Individual $indi
-     * @return bool
-     */
-    public function computeFromIndividual(Individual $indi) : bool
-    {
-        $current_sosas = $this->sosa_records_service->getSosaNumbers($indi);
-        foreach(array_keys($current_sosas) as $sosa) {
-            $this->sosa_records_service->deleteAncestorsFrom($this->tree, $this->user, $sosa);
-            $this->addNode($indi, $sosa);
-        }
-        $this->flushTmpSosaTable(true);
-        return true;
-    }
+	/**
+	 * Compute all Sosa Ancestors from a specified Individual
+	 * 
+	 * @param Individual $indi
+	 * @return bool
+	 */
+	public function computeFromIndividual(Individual $indi) : bool
+	{
+		$current_sosas = $this->sosa_records_service->getSosaNumbers($indi);
+		foreach(array_keys($current_sosas) as $sosa) {
+			$this->sosa_records_service->deleteAncestorsFrom($this->tree, $this->user, $sosa);
+			$this->addNode($indi, $sosa);
+		}
+		$this->flushTmpSosaTable(true);
+		return true;
+	}
     
-    /**
-     * Recursive method to add individual to the Sosa table, and flush it regularly
-     * 
-     * @param Individual $indi Individual to add
-     * @param int $sosa Individual's sosa
-     */
-    private function addNode(Individual $indi, int $sosa) : void
-    {
-        $birth_year = $indi->getBirthDate()->gregorianYear();
-        $birth_year_est = $birth_year === 0 ? $indi->getEstimatedBirthDate()->gregorianYear() : $birth_year;
+	/**
+	 * Recursive method to add individual to the Sosa table, and flush it regularly
+	 * 
+	 * @param Individual $indi Individual to add
+	 * @param int $sosa Individual's sosa
+	 */
+	private function addNode(Individual $indi, int $sosa) : void
+	{
+		$birth_year = $indi->getBirthDate()->gregorianYear();
+		$birth_year_est = $birth_year === 0 ? $indi->getEstimatedBirthDate()->gregorianYear() : $birth_year;
         
-        $death_year = $indi->getDeathDate()->gregorianYear();
-        $death_year_est = $death_year === 0 ? $indi->getEstimatedDeathDate()->gregorianYear() : $death_year;
+		$death_year = $indi->getDeathDate()->gregorianYear();
+		$death_year_est = $death_year === 0 ? $indi->getEstimatedDeathDate()->gregorianYear() : $death_year;
         
-        $this->tmp_sosa_table[] = array(
-            'indi' => $indi->xref(),
-            'sosa' => $sosa,
-            'birth_year' => $birth_year === 0 ? null : $birth_year,
-            'birth_year_est' => $birth_year_est === 0 ? null : $birth_year_est,
-            'death_year' => $death_year === 0 ? null : $death_year,
-            'death_year_est' => $death_year_est === 0 ? null : $death_year_est
-        );
+		$this->tmp_sosa_table[] = array(
+			'indi' => $indi->xref(),
+			'sosa' => $sosa,
+			'birth_year' => $birth_year === 0 ? null : $birth_year,
+			'birth_year_est' => $birth_year_est === 0 ? null : $birth_year_est,
+			'death_year' => $death_year === 0 ? null : $death_year,
+			'death_year_est' => $death_year_est === 0 ? null : $death_year_est
+		);
         
-        $this->flushTmpSosaTable();
+		$this->flushTmpSosaTable();
         
-        if(($fam = $indi->childFamilies()->first()) !== null) {
-            /** @var \Fisharebest\Webtrees\Family $fam */
-            if($husb = $fam->husband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->wife()) $this->addNode($wife, 2 * $sosa + 1);
-        }
-    }
+		if(($fam = $indi->childFamilies()->first()) !== null) {
+			/** @var \Fisharebest\Webtrees\Family $fam */
+			if($husb = $fam->husband()) $this->addNode($husb, 2 * $sosa);
+			if($wife = $fam->wife()) $this->addNode($wife, 2 * $sosa + 1);
+		}
+	}
     
-    /**
-     * Write sosas in the table, if the number of items is superior to the limit, or if forced.
-     *
-     * @param bool $force Should the flush be forced
-     */
-    private function flushTmpSosaTable($force = false) {
-        if( count($this->tmp_sosa_table)> 0 &&
-            ($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){
-                $this->sosa_records_service->insertOrUpdate($this->tree, $this->user, $this->tmp_sosa_table);
-                $this->tmp_sosa_table = array();
-        }
-    }
+	/**
+	 * Write sosas in the table, if the number of items is superior to the limit, or if forced.
+	 *
+	 * @param bool $force Should the flush be forced
+	 */
+	private function flushTmpSosaTable($force = false) {
+		if( count($this->tmp_sosa_table)> 0 &&
+			($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){
+				$this->sosa_records_service->insertOrUpdate($this->tree, $this->user, $this->tmp_sosa_table);
+				$this->tmp_sosa_table = array();
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
     public function computeAll(): bool
     {
         $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-        if($indi = Registry::individualFactory()->make($root_id, $this->tree)) {
+        if ($indi = Registry::individualFactory()->make($root_id, $this->tree)) {
             $this->sosa_records_service->deleteAll($this->tree, $this->user);
             $this->addNode($indi, 1);
             $this->flushTmpSosaTable(true);
@@ -95,7 +95,7 @@ 
     public function computeFromIndividual(Individual $indi) : bool
     {
         $current_sosas = $this->sosa_records_service->getSosaNumbers($indi);
-        foreach(array_keys($current_sosas) as $sosa) {
+        foreach (array_keys($current_sosas) as $sosa) {
             $this->sosa_records_service->deleteAncestorsFrom($this->tree, $this->user, $sosa);
             $this->addNode($indi, $sosa);
         }
@@ -128,10 +128,10 @@ 
         
         $this->flushTmpSosaTable();
         
-        if(($fam = $indi->childFamilies()->first()) !== null) {
+        if (($fam = $indi->childFamilies()->first()) !== null) {
             /** @var \Fisharebest\Webtrees\Family $fam */
-            if($husb = $fam->husband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->wife()) $this->addNode($wife, 2 * $sosa + 1);
+            if ($husb = $fam->husband()) $this->addNode($husb, 2 * $sosa);
+            if ($wife = $fam->wife()) $this->addNode($wife, 2 * $sosa + 1);
         }
     }
     
@@ -141,8 +141,8 @@ 
      * @param bool $force Should the flush be forced
      */
     private function flushTmpSosaTable($force = false) {
-        if( count($this->tmp_sosa_table)> 0 &&
-            ($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){
+        if (count($this->tmp_sosa_table) > 0 &&
+            ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)) {
                 $this->sosa_records_service->insertOrUpdate($this->tree, $this->user, $this->tmp_sosa_table);
                 $this->tmp_sosa_table = array();
         }

Braces +6 added lines, -2 removed lines

@@ -130,8 +130,12 @@
         
         if(($fam = $indi->childFamilies()->first()) !== null) {
             /** @var \Fisharebest\Webtrees\Family $fam */
-            if($husb = $fam->husband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->wife()) $this->addNode($wife, 2 * $sosa + 1);
+            if($husb = $fam->husband()) {
+            	$this->addNode($husb, 2 * $sosa);
+            }
+            if($wife = $fam->wife()) {
+            	$this->addNode($wife, 2 * $sosa + 1);
+            }
         }
     }