jon48 / webtrees-lib

src/Webtrees/Module/Sosa/SosaStatsController.php

Indentation +236 added lines, -236 removed lines

@@ -28,279 +28,279 @@
  */
 class SosaStatsController extends MvcController
 {
-    /**
-     * Sosa Provider for the controller
-     * @var SosaProvider $sosa_provider
-     */
-    protected $sosa_provider;
+	/**
+	 * Sosa Provider for the controller
+	 * @var SosaProvider $sosa_provider
+	 */
+	protected $sosa_provider;
     
-    /**
-     * Constructor for SosaStatsController
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for SosaStatsController
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
         
-        $this->sosa_provider = new SosaProvider(Globals::getTree(), Auth::user());
-    }
+		$this->sosa_provider = new SosaProvider(Globals::getTree(), Auth::user());
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaStats@index
-     */
-    public function index() {
-        $wt_tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Sosa Statistics'))
-            ->addInlineJavascript('$(".help_tooltip").tooltip();')
-        ;
+	/**
+	 * SosaStats@index
+	 */
+	public function index() {
+		$wt_tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Sosa Statistics'))
+			->addInlineJavascript('$(".help_tooltip").tooltip();')
+		;
 
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $controller->getPageTitle());
-        $view_bag->set('is_setup', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $controller->getPageTitle());
+		$view_bag->set('is_setup', false);
         
-        if($this->sosa_provider->isSetup()) {
-            $view_bag->set('is_setup', true);
+		if($this->sosa_provider->isSetup()) {
+			$view_bag->set('is_setup', true);
             
-            $view_bag->set('root_indi', $this->sosa_provider->getRootIndi());
+			$view_bag->set('root_indi', $this->sosa_provider->getRootIndi());
             
-            $sosaCount = $this->sosa_provider->getSosaCount();
-            $diffSosaCount = $this->sosa_provider->getDifferentSosaCount();
+			$sosaCount = $this->sosa_provider->getSosaCount();
+			$diffSosaCount = $this->sosa_provider->getDifferentSosaCount();
             
-            $general_stats = array(
-                'sosa_count' => $sosaCount,
-                'distinct_count' => $diffSosaCount,
-                'sosa_rate' => Functions::safeDivision($diffSosaCount, $this->sosa_provider->getTotalIndividuals()),
-                'pedi_collapse' => 1 - Functions::safeDivision($diffSosaCount, $sosaCount),
-                'mean_gen_time' => $this->sosa_provider->getMeanGenerationTime()
-            );
-            $view_bag->set('general_stats', $general_stats);
+			$general_stats = array(
+				'sosa_count' => $sosaCount,
+				'distinct_count' => $diffSosaCount,
+				'sosa_rate' => Functions::safeDivision($diffSosaCount, $this->sosa_provider->getTotalIndividuals()),
+				'pedi_collapse' => 1 - Functions::safeDivision($diffSosaCount, $sosaCount),
+				'mean_gen_time' => $this->sosa_provider->getMeanGenerationTime()
+			);
+			$view_bag->set('general_stats', $general_stats);
             
-            $stats_gen = $this->sosa_provider->getStatisticsByGeneration();
-            $view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$wt_tree->getNameUrl().'&gen=');
-            $view_bag->set('sosaanc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList&ged='.$wt_tree->getNameUrl().'&gen=');
+			$stats_gen = $this->sosa_provider->getStatisticsByGeneration();
+			$view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$wt_tree->getNameUrl().'&gen=');
+			$view_bag->set('sosaanc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList&ged='.$wt_tree->getNameUrl().'&gen=');
             
-            $gen_theoretical=1;
-            $total_theoretical=0;
-            $prev_diff=0;
-            $prev_known=0.5;
-            $generation_stats = array();
+			$gen_theoretical=1;
+			$total_theoretical=0;
+			$prev_diff=0;
+			$prev_known=0.5;
+			$generation_stats = array();
             
-            foreach($stats_gen as $gen => $tab){
-                $genY1= I18N::translate('-');
-                $genY2= I18N::translate('-');
-                if($tab['firstBirth']>0) $genY1=$tab['firstEstimatedBirth'];
-                if($tab['lastBirth']>0) $genY2=$tab['lastEstimatedBirth'];
-                $total_theoretical += $gen_theoretical;
-                $perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
-                $missing=2*$prev_known - $tab['sosaCount'];
-                $gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
+			foreach($stats_gen as $gen => $tab){
+				$genY1= I18N::translate('-');
+				$genY2= I18N::translate('-');
+				if($tab['firstBirth']>0) $genY1=$tab['firstEstimatedBirth'];
+				if($tab['lastBirth']>0) $genY2=$tab['lastEstimatedBirth'];
+				$total_theoretical += $gen_theoretical;
+				$perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
+				$missing=2*$prev_known - $tab['sosaCount'];
+				$gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
                 
-                $generation_stats[$gen] = array(
-                    'gen_min_birth' => $genY1,
-                    'gen_max_birth' => $genY2,
-                    'theoretical' => $gen_theoretical,
-                    'known' => $tab['sosaCount'],
-                    'perc_known' => $perc_sosa_count_theor,
-                    'missing' => $missing,
-                    'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
-                    'total_known' => $tab['sosaTotalCount'],
-                    'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
-                    'different' => $gen_diff,
-                    'perc_different' => Functions::safeDivision($gen_diff, $tab['sosaCount']),
-                    'total_different' => $tab['diffSosaTotalCount'],
-                    'pedi_collapse' => 1 - Functions::safeDivision($tab['diffSosaTotalCount'], $tab['sosaTotalCount'])
-                );
+				$generation_stats[$gen] = array(
+					'gen_min_birth' => $genY1,
+					'gen_max_birth' => $genY2,
+					'theoretical' => $gen_theoretical,
+					'known' => $tab['sosaCount'],
+					'perc_known' => $perc_sosa_count_theor,
+					'missing' => $missing,
+					'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
+					'total_known' => $tab['sosaTotalCount'],
+					'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
+					'different' => $gen_diff,
+					'perc_different' => Functions::safeDivision($gen_diff, $tab['sosaCount']),
+					'total_different' => $tab['diffSosaTotalCount'],
+					'pedi_collapse' => 1 - Functions::safeDivision($tab['diffSosaTotalCount'], $tab['sosaTotalCount'])
+				);
                 
-                $gen_theoretical = $gen_theoretical * 2;
-                $prev_known=$tab['sosaCount'];
-                $prev_diff=$tab['diffSosaTotalCount'];
-            }
+				$gen_theoretical = $gen_theoretical * 2;
+				$prev_known=$tab['sosaCount'];
+				$prev_diff=$tab['diffSosaTotalCount'];
+			}
             
-            $view_bag->set('generation_stats', $generation_stats);
+			$view_bag->set('generation_stats', $generation_stats);
             
-            $gen_depth_stats = $this->sosa_provider->getGenerationDepthStatsAtGen(1);
-            $view_bag->set('mean_gen_depth', count($gen_depth_stats) > 0 ? $gen_depth_stats[1]['mean_gen_depth'] : 0);
-            $view_bag->set('stddev_gen_depth', count($gen_depth_stats) > 0 ? $gen_depth_stats[1]['stddev_gen_depth'] : 0);
+			$gen_depth_stats = $this->sosa_provider->getGenerationDepthStatsAtGen(1);
+			$view_bag->set('mean_gen_depth', count($gen_depth_stats) > 0 ? $gen_depth_stats[1]['mean_gen_depth'] : 0);
+			$view_bag->set('stddev_gen_depth', count($gen_depth_stats) > 0 ? $gen_depth_stats[1]['stddev_gen_depth'] : 0);
             
-            $view_bag->set('top10multiancestors', $this->getTop10Ancestors());
+			$view_bag->set('top10multiancestors', $this->getTop10Ancestors());
             
-            $view_bag->set('chart_img_g2', $this->htmlAncestorDispersionG2());
-            $view_bag->set('chart_img_g3', $this->htmlAncestorDispersionG3());
+			$view_bag->set('chart_img_g2', $this->htmlAncestorDispersionG2());
+			$view_bag->set('chart_img_g3', $this->htmlAncestorDispersionG3());
             
-            $view_bag->set('chart_img_gendepth3', $this->htmlAncestorGenDepthG3());
-            //$view_bag->set('mean_gen_depth_gen3_stats', $this->sosa_provider->getMeanGeneratuonDepthAndDeviationAtGen(3));
-        }
+			$view_bag->set('chart_img_gendepth3', $this->htmlAncestorGenDepthG3());
+			//$view_bag->set('mean_gen_depth_gen3_stats', $this->sosa_provider->getMeanGeneratuonDepthAndDeviationAtGen(3));
+		}
         
-        ViewFactory::make('SosaStats', $this, $controller, $view_bag)->render();   
-    }
+		ViewFactory::make('SosaStats', $this, $controller, $view_bag)->render();   
+	}
     
-    /**
-     * Return an array of the top 10 of ancestor appearing multiple times, grouped by the number of occurrences.
-     * The key is the number of appearance, and the value contains the list of Inidvidual
-     * 
-     * @return array Top 10 ancestors with count
-     */
-    private function getTop10Ancestors()
-    {
-        $top10multiancestors = $this->sosa_provider->getTopMultiSosaAncestorsNoTies(10);
-        $top10ancestors = array();
-        if($top10multiancestors !== null && count($top10multiancestors)) {
-            foreach($top10multiancestors as $pid => $count) {
-                $indi = Individual::getInstance($pid, $this->sosa_provider->getTree());
-                if($indi !== null && $indi->canShowName()) {
-                    array_key_exists($count, $top10ancestors) ?
-                        $top10ancestors[$count][] = $indi:
-                        $top10ancestors[$count] = array($count => $indi);
-                }
-            }
-        }
-        return $top10ancestors;
-    }
+	/**
+	 * Return an array of the top 10 of ancestor appearing multiple times, grouped by the number of occurrences.
+	 * The key is the number of appearance, and the value contains the list of Inidvidual
+	 * 
+	 * @return array Top 10 ancestors with count
+	 */
+	private function getTop10Ancestors()
+	{
+		$top10multiancestors = $this->sosa_provider->getTopMultiSosaAncestorsNoTies(10);
+		$top10ancestors = array();
+		if($top10multiancestors !== null && count($top10multiancestors)) {
+			foreach($top10multiancestors as $pid => $count) {
+				$indi = Individual::getInstance($pid, $this->sosa_provider->getTree());
+				if($indi !== null && $indi->canShowName()) {
+					array_key_exists($count, $top10ancestors) ?
+						$top10ancestors[$count][] = $indi:
+						$top10ancestors[$count] = array($count => $indi);
+				}
+			}
+		}
+		return $top10ancestors;
+	}
         
-    /**
-     * Returns HTML code for a graph showing the dispersion of ancestors across father & mother
-     * @return string HTML code
-     */
-     private function htmlAncestorDispersionG2()
-    {
-        $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
-        if(count($ancestorsDispGen2) == 0) return;
+	/**
+	 * Returns HTML code for a graph showing the dispersion of ancestors across father & mother
+	 * @return string HTML code
+	 */
+	 private function htmlAncestorDispersionG2()
+	{
+		$ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
+		if(count($ancestorsDispGen2) == 0) return;
         
-        $size = '600x300';
+		$size = '600x300';
         
-        $total = array_sum($ancestorsDispGen2);
-        $father_count = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
-        $father = array (
-            'color' => '84beff', 
-            'count' => $father_count, 
-            'perc' => Functions::safeDivision($father_count, $total), 
-            'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
-        );
-        $mother_count = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
-        $mother = array (
-            'color' => 'ffd1dc', 
-            'count' => $mother_count, 
-            'perc' => Functions::safeDivision($mother_count, $total),
-            'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
-        );
-        $shared_count = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $shared = array (
-            'color' => '777777', 
-            'count' => $shared_count, 
-            'perc' => Functions::safeDivision($shared_count, $total),
-            'name' => I18N::translate('Shared')
-        );
+		$total = array_sum($ancestorsDispGen2);
+		$father_count = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
+		$father = array (
+			'color' => '84beff', 
+			'count' => $father_count, 
+			'perc' => Functions::safeDivision($father_count, $total), 
+			'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
+		);
+		$mother_count = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
+		$mother = array (
+			'color' => 'ffd1dc', 
+			'count' => $mother_count, 
+			'perc' => Functions::safeDivision($mother_count, $total),
+			'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
+		);
+		$shared_count = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
+		$shared = array (
+			'color' => '777777', 
+			'count' => $shared_count, 
+			'perc' => Functions::safeDivision($shared_count, $total),
+			'name' => I18N::translate('Shared')
+		);
         
-        $chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
-        $chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
-        $chl = 
-             $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '|' .
-             $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '|' .
-             $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
-        return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
-    }
+		$chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
+		$chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
+		$chl = 
+			 $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '|' .
+			 $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '|' .
+			 $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
+		return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+	}
     
-    /**
-     * Returns HTML code for a graph showing the dispersion of ancestors across grand-parents
-     * @return string HTML code
-     */
-    private function htmlAncestorDispersionG3()
-    {
-        $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(3);
+	/**
+	 * Returns HTML code for a graph showing the dispersion of ancestors across grand-parents
+	 * @return string HTML code
+	 */
+	private function htmlAncestorDispersionG3()
+	{
+		$ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(3);
         
-        $size = '700x300';
+		$size = '700x300';
         
-        $color_motmot = 'ffd1dc';
-        $color_motfat = 'b998a0';
-        $color_fatfat = '577292';
-        $color_fatmot = '84beff';
-        $color_shared = '777777';
+		$color_motmot = 'ffd1dc';
+		$color_motfat = 'b998a0';
+		$color_fatfat = '577292';
+		$color_fatmot = '84beff';
+		$color_shared = '777777';
     
-        $total_fatfat = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
-        $total_fatmot = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
-        $total_motfat = array_key_exists(4, $ancestorsDispGen2) ? $ancestorsDispGen2[4] : 0;
-        $total_motmot = array_key_exists(8, $ancestorsDispGen2) ? $ancestorsDispGen2[8] : 0;
-        $total_sha = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
+		$total_fatfat = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
+		$total_fatmot = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
+		$total_motfat = array_key_exists(4, $ancestorsDispGen2) ? $ancestorsDispGen2[4] : 0;
+		$total_motmot = array_key_exists(8, $ancestorsDispGen2) ? $ancestorsDispGen2[8] : 0;
+		$total_sha = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
+		$total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
     
-        $chd = $this->arrayToExtendedEncoding(array(
-	    4095 * Functions::safeDivision($total_fatfat, $total), 
-            4095 * Functions::safeDivision($total_fatmot, $total),
-            4095 * Functions::safeDivision($total_sha, $total), 
-            4095 * Functions::safeDivision($total_motfat, $total),
-            4095 * Functions::safeDivision($total_motmot, $total)          
-        ));
-        $chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
-        $chl =
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '|' .
-            I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
-         return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
-    }    
+		$chd = $this->arrayToExtendedEncoding(array(
+		4095 * Functions::safeDivision($total_fatfat, $total), 
+			4095 * Functions::safeDivision($total_fatmot, $total),
+			4095 * Functions::safeDivision($total_sha, $total), 
+			4095 * Functions::safeDivision($total_motfat, $total),
+			4095 * Functions::safeDivision($total_motmot, $total)          
+		));
+		$chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
+		$chl =
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '|' .
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '|' .
+			I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '|' .
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '|' .
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
+		 return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+	}    
     
-    /**
-     * Returns HTML code for a graph showing the grand-parents' mean generation depth and standard deviation
-     * @return string HTML code
-     */
-    private function htmlAncestorGenDepthG3() {
-        $ancestorsGenDepth3 = $this->sosa_provider->getGenerationDepthStatsAtGen(3);
-        if(count($ancestorsGenDepth3) == 0) return;
+	/**
+	 * Returns HTML code for a graph showing the grand-parents' mean generation depth and standard deviation
+	 * @return string HTML code
+	 */
+	private function htmlAncestorGenDepthG3() {
+		$ancestorsGenDepth3 = $this->sosa_provider->getGenerationDepthStatsAtGen(3);
+		if(count($ancestorsGenDepth3) == 0) return;
         
-        $ancestors = array();
-        $chd_mean = array();
-        $chd_error_low = array();
-        $chd_error_high = array();
-        foreach($ancestorsGenDepth3 as $sosa => $genDepthStat) {
-            $ancestor = Individual::getInstance($genDepthStat['root_ancestor_id'], $this->sosa_provider->getTree());
-            if($ancestor !== null && $ancestor->canShowName()) {
-                $tmp = $ancestor->getAllNames();
-                $ancestors[] = Filter::escapeUrl($tmp[$ancestor->getPrimaryName()]['fullNN']);
-            }
-            else {
-                $ancestors[] = I18N::translate('Sosa %s', I18N::number($sosa));
-            }
-            $chd_mean[] = $genDepthStat['mean_gen_depth'];
-            $chd_error_low[] = max(0, $genDepthStat['mean_gen_depth'] - $genDepthStat['stddev_gen_depth']);
-            $chd_error_high[] = $genDepthStat['mean_gen_depth'] + $genDepthStat['stddev_gen_depth'];
-        }
+		$ancestors = array();
+		$chd_mean = array();
+		$chd_error_low = array();
+		$chd_error_high = array();
+		foreach($ancestorsGenDepth3 as $sosa => $genDepthStat) {
+			$ancestor = Individual::getInstance($genDepthStat['root_ancestor_id'], $this->sosa_provider->getTree());
+			if($ancestor !== null && $ancestor->canShowName()) {
+				$tmp = $ancestor->getAllNames();
+				$ancestors[] = Filter::escapeUrl($tmp[$ancestor->getPrimaryName()]['fullNN']);
+			}
+			else {
+				$ancestors[] = I18N::translate('Sosa %s', I18N::number($sosa));
+			}
+			$chd_mean[] = $genDepthStat['mean_gen_depth'];
+			$chd_error_low[] = max(0, $genDepthStat['mean_gen_depth'] - $genDepthStat['stddev_gen_depth']);
+			$chd_error_high[] = $genDepthStat['mean_gen_depth'] + $genDepthStat['stddev_gen_depth'];
+		}
         
-        $maxChd = ceil(max($chd_error_high));
-        $chd = implode(',', $chd_mean) . '|' . implode(',', $chd_error_low) . '|' . implode(',', $chd_error_high);
-        $chxl = implode('|', array_reverse($ancestors));
-        $chbh = 30;
-        $chs = count($ancestors) * $chbh + 50;
-        $chxl_title = I18N::translate('Mean generation depth and standard deviation');
+		$maxChd = ceil(max($chd_error_high));
+		$chd = implode(',', $chd_mean) . '|' . implode(',', $chd_error_low) . '|' . implode(',', $chd_error_high);
+		$chxl = implode('|', array_reverse($ancestors));
+		$chbh = 30;
+		$chs = count($ancestors) * $chbh + 50;
+		$chxl_title = I18N::translate('Mean generation depth and standard deviation');
         
-        return "<img src=\"https://chart.googleapis.com/chart?cht=bhs&chco=84beff&chs=600x{$chs}&chbh={$chbh}&chd=t1:{$chd}&chds=0,{$maxChd}&chxt=x,x,y&chxl=1:|{$chxl_title}|2:|{$chxl}&chxp=1,50&chxr=0,0,{$maxChd},1&chm=E,577292,1:2,,2\" />";
-    }
+		return "<img src=\"https://chart.googleapis.com/chart?cht=bhs&chco=84beff&chs=600x{$chs}&chbh={$chbh}&chd=t1:{$chd}&chds=0,{$maxChd}&chxt=x,x,y&chxl=1:|{$chxl_title}|2:|{$chxl}&chxp=1,50&chxr=0,0,{$maxChd},1&chm=E,577292,1:2,,2\" />";
+	}
 
-    /**
-     * Convert an array to Google Chart encoding
-     * @param arrat $a Array to encode
-     * @return string
-     */
-    private function arrayToExtendedEncoding($a) {
-        $xencoding = WT_GOOGLE_CHART_ENCODING;
+	/**
+	 * Convert an array to Google Chart encoding
+	 * @param arrat $a Array to encode
+	 * @return string
+	 */
+	private function arrayToExtendedEncoding($a) {
+		$xencoding = WT_GOOGLE_CHART_ENCODING;
     
-        $encoding = '';
-        foreach ($a as $value) {
-            if ($value < 0) {
-                $value = 0;
-            }
-            $first  = (int) ($value / 64);
-            $second = $value % 64;
-            $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
-        }
+		$encoding = '';
+		foreach ($a as $value) {
+			if ($value < 0) {
+				$value = 0;
+			}
+			$first  = (int) ($value / 64);
+			$second = $value % 64;
+			$encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
+		}
     
-        return $encoding;
-    }
+		return $encoding;
+	}
     
     
 }
\ No newline at end of file

Spacing +40 added lines, -41 removed lines

@@ -63,7 +63,7 @@ 
         $view_bag->set('title', $controller->getPageTitle());
         $view_bag->set('is_setup', false);
         
-        if($this->sosa_provider->isSetup()) {
+        if ($this->sosa_provider->isSetup()) {
             $view_bag->set('is_setup', true);
             
             $view_bag->set('root_indi', $this->sosa_provider->getRootIndi());
@@ -84,21 +84,21 @@ 
             $view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$wt_tree->getNameUrl().'&gen=');
             $view_bag->set('sosaanc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList&ged='.$wt_tree->getNameUrl().'&gen=');
             
-            $gen_theoretical=1;
-            $total_theoretical=0;
-            $prev_diff=0;
-            $prev_known=0.5;
+            $gen_theoretical = 1;
+            $total_theoretical = 0;
+            $prev_diff = 0;
+            $prev_known = 0.5;
             $generation_stats = array();
             
-            foreach($stats_gen as $gen => $tab){
-                $genY1= I18N::translate('-');
-                $genY2= I18N::translate('-');
-                if($tab['firstBirth']>0) $genY1=$tab['firstEstimatedBirth'];
-                if($tab['lastBirth']>0) $genY2=$tab['lastEstimatedBirth'];
+            foreach ($stats_gen as $gen => $tab) {
+                $genY1 = I18N::translate('-');
+                $genY2 = I18N::translate('-');
+                if ($tab['firstBirth'] > 0) $genY1 = $tab['firstEstimatedBirth'];
+                if ($tab['lastBirth'] > 0) $genY2 = $tab['lastEstimatedBirth'];
                 $total_theoretical += $gen_theoretical;
                 $perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
-                $missing=2*$prev_known - $tab['sosaCount'];
-                $gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
+                $missing = 2 * $prev_known - $tab['sosaCount'];
+                $gen_diff = $tab['diffSosaTotalCount'] - $prev_diff;
                 
                 $generation_stats[$gen] = array(
                     'gen_min_birth' => $genY1,
@@ -107,7 +107,7 @@ 
                     'known' => $tab['sosaCount'],
                     'perc_known' => $perc_sosa_count_theor,
                     'missing' => $missing,
-                    'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
+                    'perc_missing' => 1 - Functions::safeDivision($tab['sosaCount'], 2 * $prev_known),
                     'total_known' => $tab['sosaTotalCount'],
                     'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
                     'different' => $gen_diff,
@@ -117,8 +117,8 @@ 
                 );
                 
                 $gen_theoretical = $gen_theoretical * 2;
-                $prev_known=$tab['sosaCount'];
-                $prev_diff=$tab['diffSosaTotalCount'];
+                $prev_known = $tab['sosaCount'];
+                $prev_diff = $tab['diffSosaTotalCount'];
             }
             
             $view_bag->set('generation_stats', $generation_stats);
@@ -149,13 +149,12 @@ 
     {
         $top10multiancestors = $this->sosa_provider->getTopMultiSosaAncestorsNoTies(10);
         $top10ancestors = array();
-        if($top10multiancestors !== null && count($top10multiancestors)) {
-            foreach($top10multiancestors as $pid => $count) {
+        if ($top10multiancestors !== null && count($top10multiancestors)) {
+            foreach ($top10multiancestors as $pid => $count) {
                 $indi = Individual::getInstance($pid, $this->sosa_provider->getTree());
-                if($indi !== null && $indi->canShowName()) {
+                if ($indi !== null && $indi->canShowName()) {
                     array_key_exists($count, $top10ancestors) ?
-                        $top10ancestors[$count][] = $indi:
-                        $top10ancestors[$count] = array($count => $indi);
+                        $top10ancestors[$count][] = $indi : $top10ancestors[$count] = array($count => $indi);
                 }
             }
         }
@@ -169,27 +168,27 @@ 
      private function htmlAncestorDispersionG2()
     {
         $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
-        if(count($ancestorsDispGen2) == 0) return;
+        if (count($ancestorsDispGen2) == 0) return;
         
         $size = '600x300';
         
         $total = array_sum($ancestorsDispGen2);
         $father_count = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
-        $father = array (
+        $father = array(
             'color' => '84beff', 
             'count' => $father_count, 
             'perc' => Functions::safeDivision($father_count, $total), 
             'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
         );
         $mother_count = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
-        $mother = array (
+        $mother = array(
             'color' => 'ffd1dc', 
             'count' => $mother_count, 
             'perc' => Functions::safeDivision($mother_count, $total),
             'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
         );
         $shared_count = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $shared = array (
+        $shared = array(
             'color' => '777777', 
             'count' => $shared_count, 
             'perc' => Functions::safeDivision($shared_count, $total),
@@ -199,10 +198,10 @@ 
         $chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
         $chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
         $chl = 
-             $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '|' .
-             $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '|' .
-             $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
-        return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+             $father['name'].' - '.I18N::percentage($father['perc'], 1).'|'.
+             $shared['name'].' - '.I18N::percentage($shared['perc'], 1).'|'.
+             $mother['name'].' - '.I18N::percentage($mother['perc'], 1);
+        return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"".$chart_title."\" title=\"".$chart_title."\" />";
     }
     
     /**
@@ -226,7 +225,7 @@ 
         $total_motfat = array_key_exists(4, $ancestorsDispGen2) ? $ancestorsDispGen2[4] : 0;
         $total_motmot = array_key_exists(8, $ancestorsDispGen2) ? $ancestorsDispGen2[8] : 0;
         $total_sha = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
+        $total = $total_fatfat + $total_fatmot + $total_motfat + $total_motmot + $total_sha;
     
         $chd = $this->arrayToExtendedEncoding(array(
 	    4095 * Functions::safeDivision($total_fatfat, $total), 
@@ -237,12 +236,12 @@ 
         ));
         $chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
         $chl =
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '|' .
-            I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
-         return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat').' - '.I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1).'|'.
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot').' - '.I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1).'|'.
+            I18N::translate('Shared').' - '.I18N::percentage(Functions::safeDivision($total_sha, $total), 1).'|'.
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat').' - '.I18N::percentage(Functions::safeDivision($total_motfat, $total), 1).'|'.
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot').' - '.I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
+         return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"".$chart_title."\" title=\"".$chart_title."\" />";
     }    
     
     /**
@@ -251,15 +250,15 @@ 
      */
     private function htmlAncestorGenDepthG3() {
         $ancestorsGenDepth3 = $this->sosa_provider->getGenerationDepthStatsAtGen(3);
-        if(count($ancestorsGenDepth3) == 0) return;
+        if (count($ancestorsGenDepth3) == 0) return;
         
         $ancestors = array();
         $chd_mean = array();
         $chd_error_low = array();
         $chd_error_high = array();
-        foreach($ancestorsGenDepth3 as $sosa => $genDepthStat) {
+        foreach ($ancestorsGenDepth3 as $sosa => $genDepthStat) {
             $ancestor = Individual::getInstance($genDepthStat['root_ancestor_id'], $this->sosa_provider->getTree());
-            if($ancestor !== null && $ancestor->canShowName()) {
+            if ($ancestor !== null && $ancestor->canShowName()) {
                 $tmp = $ancestor->getAllNames();
                 $ancestors[] = Filter::escapeUrl($tmp[$ancestor->getPrimaryName()]['fullNN']);
             }
@@ -272,7 +271,7 @@ 
         }
         
         $maxChd = ceil(max($chd_error_high));
-        $chd = implode(',', $chd_mean) . '|' . implode(',', $chd_error_low) . '|' . implode(',', $chd_error_high);
+        $chd = implode(',', $chd_mean).'|'.implode(',', $chd_error_low).'|'.implode(',', $chd_error_high);
         $chxl = implode('|', array_reverse($ancestors));
         $chbh = 30;
         $chs = count($ancestors) * $chbh + 50;
@@ -294,9 +293,9 @@ 
             if ($value < 0) {
                 $value = 0;
             }
-            $first  = (int) ($value / 64);
+            $first  = (int)($value / 64);
             $second = $value % 64;
-            $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
+            $encoding .= $xencoding[(int)$first].$xencoding[(int)$second];
         }
     
         return $encoding;

src/Webtrees/Module/Sosa/Views/SosaStatsView.php

Spacing +14 added lines, -14 removed lines

@@ -31,11 +31,11 @@ 
 			<?php 
 			/** @var \Fisharebest\Webtrees\Individual $root_indi */
 			$root_indi = $this->data->get('root_indi');
-			if($root_indi !== null && $root_indi->canShowName()) { ?>
+			if ($root_indi !== null && $root_indi->canShowName()) { ?>
 			<h4 class="center"><?= I18N::translate('%s: %s', I18N::translate('Root individual'), $root_indi->getFullName()); ?><h4>
 			<?php } ?>
 			
-			<?php  if($this->data->get('is_setup')) {  
+			<?php  if ($this->data->get('is_setup')) {  
 			    $general_stats = $this->data->get('general_stats'); ?>
 			<h3><?php echo I18N::translate('General statistics'); ?></h3>
 			<div class="maj-table">
@@ -57,7 +57,7 @@ 
 				</div>
 				<div class="maj-row">
 					<div class="label"><?php echo I18N::translate('Generation mean duration'); ?></div>
-					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'],  I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
+					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'], I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
 				</div>
 			</div>
 			
@@ -97,7 +97,7 @@ 
 					</tr>
 				</thead>
 				<tbody>
-					<?php foreach($this->data->get('generation_stats') as $gen => $row) { ?>
+					<?php foreach ($this->data->get('generation_stats') as $gen => $row) { ?>
 					<tr class="maj-row">
 						<td class="label"><?php echo I18N::translate('<strong>G%d</strong>', $gen); ?></td>
 						<td class="label"><?php echo I18N::translate('%1$s <> %2$s', $row['gen_min_birth'], $row['gen_max_birth']); ?></td>
@@ -111,7 +111,7 @@ 
 						<td class="value"><?php echo I18N::number($row['different']); ?></td>
 						<td class="value left percent_container">
 							<div class="percent_frame">
-								<div class="percent_cell" style="width:<?php echo 100*$row['perc_different'] ?>%;">
+								<div class="percent_cell" style="width:<?php echo 100 * $row['perc_different'] ?>%;">
 									&nbsp;<?php echo I18N::percentage($row['perc_different']); ?>&nbsp;
 								</div>
 							</div>
@@ -131,17 +131,17 @@ 
 							             I18N::translate('%s generation'),
 							             I18N::translate('%s generations'),
 							             $this->data->get('mean_gen_depth'),
-							             I18N::number($this->data->get('mean_gen_depth'),2)
+							             I18N::number($this->data->get('mean_gen_depth'), 2)
 							         )
 							    ).
-								' &mdash; ' . 
+								' &mdash; '. 
 								I18N::translate(
 								    'Standard deviation: %s',
 								    I18N::plural(
 								        I18N::translate('%s generation'), 
 								        I18N::translate('%s generations'), 
 								        $this->data->get('stddev_gen_depth'), 
-								        I18N::number($this->data->get('stddev_gen_depth'),2)
+								        I18N::number($this->data->get('stddev_gen_depth'), 2)
 								    )
 								);
 							?>
@@ -153,17 +153,17 @@ 
 			
 			<?php  
 			$top10_multi_ancestors = $this->data->get('top10multiancestors');
-			if(count($top10_multi_ancestors) > 0) { ?>
+			if (count($top10_multi_ancestors) > 0) { ?>
 			<h3><?= I18N::translate('Most duplicated root Sosa ancestors'); ?></h3>
 			<div class="maj-table">
-			<?php foreach($top10_multi_ancestors as $count => $indis) { ?>
+			<?php foreach ($top10_multi_ancestors as $count => $indis) { ?>
 			    <div class="maj-row">
 			    	<div class="label"><?= I18N::translate('%s times', I18N::number($count)); ?></div>
 			    	<div class="value"><?php 
 			    	echo implode(
 			    	    I18N::$list_separator, 
 			    	    array_map(function(Individual $indi) {
-			    	        return '<a href="'. $indi->getHtmlUrl(). '">'. $indi->getFullName() . '&nbsp;' . $indi->getSexImage() . '</a>';
+			    	        return '<a href="'.$indi->getHtmlUrl().'">'.$indi->getFullName().'&nbsp;'.$indi->getSexImage().'</a>';
 			    	    }, $indis)
 			    	);
 			    	?></div>
@@ -174,14 +174,14 @@ 
 			
 			<h3><?php echo I18N::translate('Known Sosa ancestors\' family dispersion'); ?></h3>
 			<div class="center">
-				<?php echo $this->data->get('chart_img_g2') ?: '' ; ?>
-				<?php echo $this->data->get('chart_img_g3') ?: '' ; ?>
+				<?php echo $this->data->get('chart_img_g2') ?: ''; ?>
+				<?php echo $this->data->get('chart_img_g3') ?: ''; ?>
 				<!--  <canvas id="chart_ancestors_g2" width="300" height="300"></canvas>  -->
 			</div>
 			
 			<h3><?php echo I18N::translate('Mean generation depth by grandparents'); ?></h3>
 			<div class="center">
-				<?php echo $this->data->get('chart_img_gendepth3') ?: '' ; ?>
+				<?php echo $this->data->get('chart_img_gendepth3') ?: ''; ?>
 			</div>
 			
 			<?php   } else { ?>

src/Webtrees/Module/Sosa/Model/SosaProvider.php

Indentation +710 added lines, -710 removed lines

@@ -22,413 +22,413 @@ 
  */
 class SosaProvider {
     
-    /**
-     * Maximum number of generation the database is able to hold.
-     * @var int MAX_DB_GENERATIONS
-     */
-    const MAX_DB_GENERATIONS = 64;
-    
-    /**
-     * System's default user (ID -1 in the database
-     * @var User $default_user
-     */
-    protected static $default_user;
-    
-    /**
-     * Reference user
-     * @var User $user
-     */
-    protected $user;
-    
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    protected $tree;
-    
-    /**
-     * Cached list of Sosa Individuals by generation
-     * Format: key = generation, value = array ( sosa => Individual ID)
-     * @var array $sosa_list_by_gen
-     */
-    protected $sosa_list_by_gen;
-    
-    /**
-     * Cached list of Sosa Families by generation
-     * Format: key = generation, value = array ( sosa => Family ID)
-     * @var unknown $sosa_fam_list_by_gen
-     */
-    protected $sosa_fam_list_by_gen;
-    
-    /**
-     * Cached array of statistics by generation
-     * Format:  key = generation, 
-     *          value = array(
-     *              sosaCount, sosaTotalCount, diffSosaTotalCount, firstBirth, lastBirth, avgBirth
-     *           )
-     * @var array $statistics_tab
-     */
-    protected $statistics_tab;
-    
-    /**
-     * Has the provider's initialisation completed
-     * @var bool $is_setup
-     */
-    protected $is_setup;
-    
-    /**
-     * Constructor for Sosa Provider.
-     * A provider is defined in relation to a specific tree and reference user.
-     * 
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_user === null) 
-            self::$default_user = User::find(-1);
+	/**
+	 * Maximum number of generation the database is able to hold.
+	 * @var int MAX_DB_GENERATIONS
+	 */
+	const MAX_DB_GENERATIONS = 64;
+    
+	/**
+	 * System's default user (ID -1 in the database
+	 * @var User $default_user
+	 */
+	protected static $default_user;
+    
+	/**
+	 * Reference user
+	 * @var User $user
+	 */
+	protected $user;
+    
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	protected $tree;
+    
+	/**
+	 * Cached list of Sosa Individuals by generation
+	 * Format: key = generation, value = array ( sosa => Individual ID)
+	 * @var array $sosa_list_by_gen
+	 */
+	protected $sosa_list_by_gen;
+    
+	/**
+	 * Cached list of Sosa Families by generation
+	 * Format: key = generation, value = array ( sosa => Family ID)
+	 * @var unknown $sosa_fam_list_by_gen
+	 */
+	protected $sosa_fam_list_by_gen;
+    
+	/**
+	 * Cached array of statistics by generation
+	 * Format:  key = generation, 
+	 *          value = array(
+	 *              sosaCount, sosaTotalCount, diffSosaTotalCount, firstBirth, lastBirth, avgBirth
+	 *           )
+	 * @var array $statistics_tab
+	 */
+	protected $statistics_tab;
+    
+	/**
+	 * Has the provider's initialisation completed
+	 * @var bool $is_setup
+	 */
+	protected $is_setup;
+    
+	/**
+	 * Constructor for Sosa Provider.
+	 * A provider is defined in relation to a specific tree and reference user.
+	 * 
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function __construct(Tree $tree, User $user = null) {
+		if(self::$default_user === null) 
+			self::$default_user = User::find(-1);
         
-        $this->tree = $tree;
-        $this->user = $user;
-        $this->is_setup = true;
-        if($this->user === null) $this->user = Auth::user();
-        if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
+		$this->tree = $tree;
+		$this->user = $user;
+		$this->is_setup = true;
+		if($this->user === null) $this->user = Auth::user();
+		if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
         
-        // Check if the user, or the default user, has a root already setup;
-        if(empty($this->getRootIndiId())) {
-            if($this->user == self::$default_user) {  // If the default user is not setup
-                $this->is_setup = false;
-            }
-            else {
-                $this->user = self::$default_user;
-                $this->is_setup = $this->getRootIndiId() === null;
-            }            
-        }
-    }
-    
-    /**
-     * Returns is the Provider has been successfully set up
-     * @return bool
-     */
-    public function isSetup() {
-        return $this->is_setup;
-    }
-    
-    /**
-     * Return the reference tree
-     * 
-     *  @return Tree Reference tree
-     */
-    public function getTree() {
-        return $this->tree;
-    }
-    
-    /**
-     * Return the reference user
-     * 
-     * @return User
-     */
-    public function getUser() {
-        return $this->user;
-    }
-    
-    /**
-     * Return the root individual ID for the reference tree and user.
-     * @return string Individual ID
-     */
-    public function getRootIndiId() {
-        return $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-    }
-    
-    /**
-     * Return the root individual for the reference tree and user.
-     * @return Individual Individual
-     */
-    public function getRootIndi() {
-        $root_indi_id = $this->getRootIndiId();
-        if(!empty($root_indi_id)) {
-            return Individual::getInstance($root_indi_id, $this->tree);
-        }
-        return null;
-    }
+		// Check if the user, or the default user, has a root already setup;
+		if(empty($this->getRootIndiId())) {
+			if($this->user == self::$default_user) {  // If the default user is not setup
+				$this->is_setup = false;
+			}
+			else {
+				$this->user = self::$default_user;
+				$this->is_setup = $this->getRootIndiId() === null;
+			}            
+		}
+	}
+    
+	/**
+	 * Returns is the Provider has been successfully set up
+	 * @return bool
+	 */
+	public function isSetup() {
+		return $this->is_setup;
+	}
+    
+	/**
+	 * Return the reference tree
+	 * 
+	 *  @return Tree Reference tree
+	 */
+	public function getTree() {
+		return $this->tree;
+	}
+    
+	/**
+	 * Return the reference user
+	 * 
+	 * @return User
+	 */
+	public function getUser() {
+		return $this->user;
+	}
+    
+	/**
+	 * Return the root individual ID for the reference tree and user.
+	 * @return string Individual ID
+	 */
+	public function getRootIndiId() {
+		return $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
+	}
+    
+	/**
+	 * Return the root individual for the reference tree and user.
+	 * @return Individual Individual
+	 */
+	public function getRootIndi() {
+		$root_indi_id = $this->getRootIndiId();
+		if(!empty($root_indi_id)) {
+			return Individual::getInstance($root_indi_id, $this->tree);
+		}
+		return null;
+	}
        
-    /*****************
+	/*****************
      * DATA CRUD LAYER
      *****************/
     
-    /**
-     * Remove all Sosa entries related to the gedcom file and user
-     */
-    public function deleteAll() {
-        if(!$this->is_setup) return;
-        Database::prepare(
-            'DELETE FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()                
-            ));
-    }
-    
-    /**
-     * Remove all ancestors of a sosa number
-     * 
-     * @param int $sosa
-     */
-    public function deleteAncestors($sosa) {
-        if(!$this->is_setup) return;
-        $gen = Functions::getGeneration($sosa);
-        Database::prepare(
-            'DELETE FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
-            ' AND majs_gen >= :gen' .
-            ' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
-        )->execute(array(
-            'tree_id' => $this->tree->getTreeId(), 
-            'user_id' => $this->user->getUserId(),
-            'gen' => $gen,
-            'sosa' => $sosa
-        ));
-    }    
-    
-    /**
-     * Insert (or update if already existing) a list of Sosa individuals
-     * @param array $sosa_records
-     */
-    public function insertOrUpdate($sosa_records) {
-        if(!$this->is_setup) return;
+	/**
+	 * Remove all Sosa entries related to the gedcom file and user
+	 */
+	public function deleteAll() {
+		if(!$this->is_setup) return;
+		Database::prepare(
+			'DELETE FROM `##maj_sosa`'.
+			' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()                
+			));
+	}
+    
+	/**
+	 * Remove all ancestors of a sosa number
+	 * 
+	 * @param int $sosa
+	 */
+	public function deleteAncestors($sosa) {
+		if(!$this->is_setup) return;
+		$gen = Functions::getGeneration($sosa);
+		Database::prepare(
+			'DELETE FROM `##maj_sosa`'.
+			' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
+			' AND majs_gen >= :gen' .
+			' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
+		)->execute(array(
+			'tree_id' => $this->tree->getTreeId(), 
+			'user_id' => $this->user->getUserId(),
+			'gen' => $gen,
+			'sosa' => $sosa
+		));
+	}    
+    
+	/**
+	 * Insert (or update if already existing) a list of Sosa individuals
+	 * @param array $sosa_records
+	 */
+	public function insertOrUpdate($sosa_records) {
+		if(!$this->is_setup) return;
         
-        $treeid = $this->tree->getTreeId();
-        $userid = $this->user->getUserId();
-        $questionmarks_table = array();
-        $values_table = array();
+		$treeid = $this->tree->getTreeId();
+		$userid = $this->user->getUserId();
+		$questionmarks_table = array();
+		$values_table = array();
         
-        $i = 0;
-        foreach  ($sosa_records as $row) {
-            $gen = Functions::getGeneration($row['sosa']);
-            if($gen <= self::MAX_DB_GENERATIONS) {
-                $questionmarks_table[] = 
-                    '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
-                $values_table = array_merge(
-                    $values_table, 
-                    array(
-                        'tree_id'.$i => $treeid, 
-                        'user_id'.$i => $userid, 
-                        'sosa'.$i => $row['sosa'], 
-                        'indi_id'.$i => $row['indi'], 
-                        'gen'.$i => Functions::getGeneration($row['sosa']),
-                        'byear'.$i => $row['birth_year'],
-                        'byearest'.$i => $row['birth_year_est'],
-                        'dyear'.$i => $row['death_year'],
-                        'dyearest'.$i => $row['death_year_est']
-                    )
-                );
-            }
-            $i++;
-        }
+		$i = 0;
+		foreach  ($sosa_records as $row) {
+			$gen = Functions::getGeneration($row['sosa']);
+			if($gen <= self::MAX_DB_GENERATIONS) {
+				$questionmarks_table[] = 
+					'(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
+				$values_table = array_merge(
+					$values_table, 
+					array(
+						'tree_id'.$i => $treeid, 
+						'user_id'.$i => $userid, 
+						'sosa'.$i => $row['sosa'], 
+						'indi_id'.$i => $row['indi'], 
+						'gen'.$i => Functions::getGeneration($row['sosa']),
+						'byear'.$i => $row['birth_year'],
+						'byearest'.$i => $row['birth_year_est'],
+						'dyear'.$i => $row['death_year'],
+						'dyearest'.$i => $row['death_year_est']
+					)
+				);
+			}
+			$i++;
+		}
         
-        $sql = 'REPLACE INTO `##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(',', $questionmarks_table);
-        Database::prepare($sql)->execute($values_table);
-    }
+		$sql = 'REPLACE INTO `##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(',', $questionmarks_table);
+		Database::prepare($sql)->execute($values_table);
+	}
     
-    /****************
+	/****************
      * SIMPLE QUERIES
      ****************/
     
-    /**
-     * Returns the list of Sosa numbers to which an individual is related.
-     * Format: key = sosa number, value = generation for the Sosa number
-     * 
-     * @param Individual $indi
-     * @return array Array of sosa numbers
-     */
-    public function getSosaNumbers(Individual $indi) {
-        if(!$this->is_setup) return array();
-        return Database::prepare(
-                'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
-                ' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
-            )->execute(array(
-                'indi_id' => $indi->getXref(), 
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()
-            ))->fetchAssoc();
-    }
-    
-    /**
-     * Get the last generation of Sosa ancestors
-     *
-     * @return number Last generation if found, 1 otherwise
-     */
-    public function getLastGeneration() {
-        if(!$this->is_setup) return;
-        return Database::prepare(
-                'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
-                ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
-            )->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()                
-            ))->fetchOne() ?: 1;
-    }
-    
-    /*************
+	/**
+	 * Returns the list of Sosa numbers to which an individual is related.
+	 * Format: key = sosa number, value = generation for the Sosa number
+	 * 
+	 * @param Individual $indi
+	 * @return array Array of sosa numbers
+	 */
+	public function getSosaNumbers(Individual $indi) {
+		if(!$this->is_setup) return array();
+		return Database::prepare(
+				'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
+				' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
+			)->execute(array(
+				'indi_id' => $indi->getXref(), 
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()
+			))->fetchAssoc();
+	}
+    
+	/**
+	 * Get the last generation of Sosa ancestors
+	 *
+	 * @return number Last generation if found, 1 otherwise
+	 */
+	public function getLastGeneration() {
+		if(!$this->is_setup) return;
+		return Database::prepare(
+				'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
+				' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
+			)->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()                
+			))->fetchOne() ?: 1;
+	}
+    
+	/*************
      * SOSA LISTS
      *************/
     
-    /**
-     * Return the list of all sosas, with the generations it belongs to
-     *
-     * @return array Associative array of Sosa ancestors, with their generation, comma separated
-     */
-    public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
-        return Database::prepare(
-            'SELECT majs_i_id AS indi,' .
-            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
-            ' FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
-            ' GROUP BY majs_i_id'
-        )->execute(array(
-            'tree_id' => $this->tree->getTreeId(),
-            'user_id' => $this->user->getUserId()
-        ))->fetchAssoc();
-    }
-    
-    /**
-     * Get an associative array of Sosa individuals in generation G. Keys are Sosa numbers, values individuals.
-     *
-     * @param number $gen Generation
-     * @return array Array of Sosa individuals
-     */
-    public function getSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_list_by_gen)
-            $this->sosa_list_by_gen = array();
+	/**
+	 * Return the list of all sosas, with the generations it belongs to
+	 *
+	 * @return array Associative array of Sosa ancestors, with their generation, comma separated
+	 */
+	public function getAllSosaWithGenerations(){
+		if(!$this->is_setup) return array();
+		return Database::prepare(
+			'SELECT majs_i_id AS indi,' .
+			' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
+			' FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
+			' GROUP BY majs_i_id'
+		)->execute(array(
+			'tree_id' => $this->tree->getTreeId(),
+			'user_id' => $this->user->getUserId()
+		))->fetchAssoc();
+	}
+    
+	/**
+	 * Get an associative array of Sosa individuals in generation G. Keys are Sosa numbers, values individuals.
+	 *
+	 * @param number $gen Generation
+	 * @return array Array of Sosa individuals
+	 */
+	public function getSosaListAtGeneration($gen){
+		if(!$this->is_setup) return array();
+		if(!$this->sosa_list_by_gen)
+			$this->sosa_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_list_by_gen[$gen])){
-                $this->sosa_list_by_gen[$gen] = Database::prepare(
-                    'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
-                    ' FROM `##maj_sosa`'.
-                    ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-                    ' AND majs_gen = :gen'.
-                    ' ORDER BY majs_sosa ASC')
-                ->execute(array(
-                    'tree_id' => $this->tree->getTreeId(),
-                    'user_id' => $this->user->getUserId(),
-                    'gen' => $gen
-                ))
-                ->fetchAssoc();
-            }
-            return $this->sosa_list_by_gen[$gen];
-        }
-        return array();
-    }
-    
-    /**
-     * Get an associative array of Sosa families in generation G. Keys are Sosa numbers for the husband, values families.
-     *
-     * @param number $gen Generation
-     * @return array Array of Sosa families
-     */
-    public function getFamilySosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_fam_list_by_gen)
-            $this->sosa_fam_list_by_gen = array();
+		if($gen){
+			if(!isset($this->sosa_list_by_gen[$gen])){
+				$this->sosa_list_by_gen[$gen] = Database::prepare(
+					'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
+					' FROM `##maj_sosa`'.
+					' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+					' AND majs_gen = :gen'.
+					' ORDER BY majs_sosa ASC')
+				->execute(array(
+					'tree_id' => $this->tree->getTreeId(),
+					'user_id' => $this->user->getUserId(),
+					'gen' => $gen
+				))
+				->fetchAssoc();
+			}
+			return $this->sosa_list_by_gen[$gen];
+		}
+		return array();
+	}
+    
+	/**
+	 * Get an associative array of Sosa families in generation G. Keys are Sosa numbers for the husband, values families.
+	 *
+	 * @param number $gen Generation
+	 * @return array Array of Sosa families
+	 */
+	public function getFamilySosaListAtGeneration($gen){
+		if(!$this->is_setup) return array();
+		if(!$this->sosa_fam_list_by_gen)
+			$this->sosa_fam_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_fam_list_by_gen[$gen])){
-                $this->sosa_fam_list_by_gen[$gen] = Database::prepare(
-                    'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
-                    ' FROM `##families`'.
-                    ' INNER JOIN `##maj_sosa` AS s1 ON (`##families`.f_husb = s1.majs_i_id AND `##families`.f_file = s1.majs_gedcom_id)'.
-                    ' INNER JOIN `##maj_sosa` AS s2 ON (`##families`.f_wife = s2.majs_i_id AND `##families`.f_file = s2.majs_gedcom_id)'.
-                    ' WHERE s1.majs_sosa + 1 = s2.majs_sosa'.
-                    ' AND s1.majs_gedcom_id= :tree_id AND s1.majs_user_id=:user_id'.
-                    ' AND s2.majs_gedcom_id= :tree_id AND s2.majs_user_id=:user_id'.
-                    ' AND s1.majs_gen = :gen'.
-                    ' ORDER BY s1.majs_sosa ASC'
-                    )
-                    ->execute(array(
-                        'tree_id' => $this->tree->getTreeId(),
-                        'user_id' => $this->user->getUserId(),
-                        'gen' => $gen
-                    ))
-                    ->fetchAssoc();
-            }
-            return $this->sosa_fam_list_by_gen[$gen];
-        }
-        return array();
-    }
-    
-    /**
-     * Get an associative array of Sosa individuals in generation G who are missing parents. Keys are Sosa numbers, values individuals.
-     *
-     * @param number $gen Generation
-     * @return array Array of Sosa individuals
-     */
-    public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
-        if($gen){
-            return $this->sosa_list_by_gen[$gen] = Database::prepare(
-                'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
-                ' FROM `##maj_sosa` schild'.
-                ' LEFT JOIN `##maj_sosa` sfat ON ((schild.majs_sosa * 2) = sfat.majs_sosa AND schild.majs_gedcom_id = sfat.majs_gedcom_id AND schild.majs_user_id = sfat.majs_user_id)'.
-                ' LEFT JOIN `##maj_sosa` smot ON ((schild.majs_sosa * 2 + 1) = smot.majs_sosa AND schild.majs_gedcom_id = smot.majs_gedcom_id AND schild.majs_user_id = smot.majs_user_id)'.
-                ' WHERE schild.majs_gedcom_id = :tree_id AND schild.majs_user_id = :user_id'.
-                ' AND schild.majs_gen = :gen'.
-                ' AND (sfat.majs_sosa IS NULL OR smot.majs_sosa IS NULL)'.
-                ' ORDER BY schild.majs_sosa ASC')
-                ->execute(array(
-                    'tree_id' => $this->tree->getTreeId(),
-                    'user_id' => $this->user->getUserId(),
-                    'gen' => $gen - 1
-                ))->fetchAll(\PDO::FETCH_ASSOC);
-        }
-        return array();
-    }
-    
-    
-    
-    /*************
+		if($gen){
+			if(!isset($this->sosa_fam_list_by_gen[$gen])){
+				$this->sosa_fam_list_by_gen[$gen] = Database::prepare(
+					'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
+					' FROM `##families`'.
+					' INNER JOIN `##maj_sosa` AS s1 ON (`##families`.f_husb = s1.majs_i_id AND `##families`.f_file = s1.majs_gedcom_id)'.
+					' INNER JOIN `##maj_sosa` AS s2 ON (`##families`.f_wife = s2.majs_i_id AND `##families`.f_file = s2.majs_gedcom_id)'.
+					' WHERE s1.majs_sosa + 1 = s2.majs_sosa'.
+					' AND s1.majs_gedcom_id= :tree_id AND s1.majs_user_id=:user_id'.
+					' AND s2.majs_gedcom_id= :tree_id AND s2.majs_user_id=:user_id'.
+					' AND s1.majs_gen = :gen'.
+					' ORDER BY s1.majs_sosa ASC'
+					)
+					->execute(array(
+						'tree_id' => $this->tree->getTreeId(),
+						'user_id' => $this->user->getUserId(),
+						'gen' => $gen
+					))
+					->fetchAssoc();
+			}
+			return $this->sosa_fam_list_by_gen[$gen];
+		}
+		return array();
+	}
+    
+	/**
+	 * Get an associative array of Sosa individuals in generation G who are missing parents. Keys are Sosa numbers, values individuals.
+	 *
+	 * @param number $gen Generation
+	 * @return array Array of Sosa individuals
+	 */
+	public function getMissingSosaListAtGeneration($gen){
+		if(!$this->is_setup) return array();    
+		if($gen){
+			return $this->sosa_list_by_gen[$gen] = Database::prepare(
+				'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
+				' FROM `##maj_sosa` schild'.
+				' LEFT JOIN `##maj_sosa` sfat ON ((schild.majs_sosa * 2) = sfat.majs_sosa AND schild.majs_gedcom_id = sfat.majs_gedcom_id AND schild.majs_user_id = sfat.majs_user_id)'.
+				' LEFT JOIN `##maj_sosa` smot ON ((schild.majs_sosa * 2 + 1) = smot.majs_sosa AND schild.majs_gedcom_id = smot.majs_gedcom_id AND schild.majs_user_id = smot.majs_user_id)'.
+				' WHERE schild.majs_gedcom_id = :tree_id AND schild.majs_user_id = :user_id'.
+				' AND schild.majs_gen = :gen'.
+				' AND (sfat.majs_sosa IS NULL OR smot.majs_sosa IS NULL)'.
+				' ORDER BY schild.majs_sosa ASC')
+				->execute(array(
+					'tree_id' => $this->tree->getTreeId(),
+					'user_id' => $this->user->getUserId(),
+					'gen' => $gen - 1
+				))->fetchAll(\PDO::FETCH_ASSOC);
+		}
+		return array();
+	}
+    
+    
+    
+	/*************
      * STATISTICS
      *************/
-    /**
-     * 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 getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
-        if(!$this->statistics_tab) {
-            $this->statistics_tab = array();
-            if($maxGeneration = $this->getLastGeneration()) {
-                for ($gen = 1; $gen <= $maxGeneration; $gen++) {
-                    $birthStats = $this->getStatsBirthYearInGeneration($gen);
-                    $this->statistics_tab[$gen] = array(
-                        'sosaCount'				=>	$this->getSosaCountAtGeneration($gen),
-                        'sosaTotalCount'		=>	$this->getSosaCountUpToGeneration($gen),
-                        'diffSosaTotalCount'	=>	$this->getDifferentSosaCountUpToGeneration($gen),
-                        'firstBirth'			=>	$birthStats['first'],
-                        'firstEstimatedBirth'	=>	$birthStats['first_est'],
-                        'lastBirth'				=>	$birthStats['last'],
-                        'lastEstimatedBirth'	=>	$birthStats['last_est'],
-                        'avgBirth'				=>	$birthStats['avg']
-                    );
-                }
-            }
-        }
-        return $this->statistics_tab;        
-    }
+	/**
+	 * 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 getStatisticsByGeneration() {
+		if(!$this->is_setup) return array();
+		if(!$this->statistics_tab) {
+			$this->statistics_tab = array();
+			if($maxGeneration = $this->getLastGeneration()) {
+				for ($gen = 1; $gen <= $maxGeneration; $gen++) {
+					$birthStats = $this->getStatsBirthYearInGeneration($gen);
+					$this->statistics_tab[$gen] = array(
+						'sosaCount'				=>	$this->getSosaCountAtGeneration($gen),
+						'sosaTotalCount'		=>	$this->getSosaCountUpToGeneration($gen),
+						'diffSosaTotalCount'	=>	$this->getDifferentSosaCountUpToGeneration($gen),
+						'firstBirth'			=>	$birthStats['first'],
+						'firstEstimatedBirth'	=>	$birthStats['first_est'],
+						'lastBirth'				=>	$birthStats['last'],
+						'lastEstimatedBirth'	=>	$birthStats['last_est'],
+						'avgBirth'				=>	$birthStats['avg']
+					);
+				}
+			}
+		}
+		return $this->statistics_tab;        
+	}
     
 	/**
 	 * How many individuals exist in the tree.
@@ -436,332 +436,332 @@ 
 	 * @return int
 	 */
 	public function getTotalIndividuals() {
-	    if(!$this->is_setup) return 0;
-	    return Database::prepare(
-	        'SELECT COUNT(*) FROM `##individuals`' .
-	        ' WHERE i_file = :tree_id')
-	        ->execute(array('tree_id' => $this->tree->getTreeId()))
-	        ->fetchOne() ?: 0;
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT COUNT(*) FROM `##individuals`' .
+			' WHERE i_file = :tree_id')
+			->execute(array('tree_id' => $this->tree->getTreeId()))
+			->fetchOne() ?: 0;
 	}
     
-    /**
-     * Get the total Sosa count for all generations
-     *
-     * @return number Number of Sosas
-     */
-    public function getSosaCount(){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId() 
-            ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the number of Sosa in a specific generation.
-     *
-     * @param number $gen Generation
-     * @return number Number of Sosas in generation
-     */
-    public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen= :gen')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen            
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the total number of Sosa up to a specific generation.
-     *
-     * @param number $gen Generation
-     * @return number Total number of Sosas up to generation
-     */
-    public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen <= :gen')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen 
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the total number of distinct Sosa individual for all generations.
-     *
-     * @return number Total number of distinct individual
-     */
-    public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the number of distinct Sosa individual up to a specific generation.
-     *
-     * @param number $gen Generation
-     * @return number Number of distinct Sosa individuals up to generation
-     */
-    public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen <= :gen')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen 
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get an array of birth statistics for a specific generation
-     * Statistics are :
-     * 	- first : First birth year in generation
-     *  - first_est: First estimated birth year in generation
-     *  - last : Last birth year in generation
-     *  - last_est : Last estimated birth year in generation
-     *  - avg : Average birth year (based on non-estimated birth date)
-     *
-     * @param number $gen Generation
-     * @return array Birth statistics array
-     */
-    public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
-        return Database::prepare(
-            'SELECT'.
-            ' MIN(majs_birth_year) AS first, MIN(majs_birth_year_est) AS first_est,'.
-            ' AVG(majs_birth_year) AS avg,'.
-            ' MAX(majs_birth_year) AS last, MAX(majs_birth_year_est) AS last_est'.
-            ' FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen=:gen')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen))
-            ->fetchOneRow(\PDO::FETCH_ASSOC) ?: array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
-    }
-    
-    /**
-     * Get the mean generation time, based on a linear regression of birth years and generations
-     *
-     * @return number|NULL Mean generation time
-     */
-    public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
-        if(!$this->statistics_tab){
-            $this->getStatisticsByGeneration();
-        }
-        //Linear regression on x=generation and y=birthdate
-        $sum_xy = $sum_x = $sum_y= $sum_x2 = $n = 0;
-        foreach($this->statistics_tab as $gen=>$stats){
-            if(!is_null($stats['avgBirth'])) {
-                $n++;
-                $sum_xy+=$gen*$stats['avgBirth'];
-                $sum_x+=$gen;
-                $sum_y+=$stats['avgBirth'];
-                $sum_x2+=$gen*$gen;
-            }
-        }
-        $denom=($n*$sum_x2)-($sum_x*$sum_x);
-        if($denom!=0){
-            return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
-        }
-        return null;
-    }
-    
-    /**
-     * Return an array 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: array
-     *      - root_ancestor_id : ID of the ancestor
-     *      - mean_gen_depth : Mean generation depth
-     *      - stddev_gen_depth : Standard deviation of generation depth
-     *  
-     * @param number $gen Sosa generation
-     * @return array
-     */
-    public function getGenerationDepthStatsAtGen($gen) {
-        if(!$this->is_setup) return array();
-        $gen_depth_stats_raw = Database::prepare(
-            'SELECT stats_by_gen.root_ancestor AS root_ancestor_sosa,'.
-            '   sosa_list.majs_i_id as root_ancestor_id,'.
-            '   1 + SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))) AS mean_gen_depth,'.
-            '   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'.
-            ' FROM('.
-            '   SELECT'.
-            '       sosa.majs_gedcom_id,'.
-            '       sosa.majs_user_id,'.
-            '       sosa.majs_gen - :gen AS majs_gen_norm,'.
-            '       FLOOR(((sosa.majs_sosa / POW(2, sosa.majs_gen -1 )) - 1) * POWER(2, :gen - 1)) + POWER(2, :gen - 1) AS root_ancestor,'.
-            '       SUM(case when sosa_fat.majs_i_id IS NULL AND sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count,'.
-            '       SUM(case when sosa_fat.majs_i_id IS NULL AND sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count'.
-            '   FROM `##maj_sosa` AS sosa'.
-            '   LEFT JOIN `##maj_sosa` AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.
-            '       AND sosa_fat.majs_gedcom_id = sosa.majs_gedcom_id'.
-            '       AND sosa_fat.majs_user_id = sosa.majs_user_id'.
-            '   LEFT JOIN `##maj_sosa` AS sosa_mot ON sosa_mot.majs_sosa = 2 * sosa.majs_sosa + 1'.
-            '       AND sosa_mot.majs_gedcom_id = sosa.majs_gedcom_id'.
-            '       AND sosa_mot.majs_user_id = sosa.majs_user_id'.
-            '   WHERE sosa.majs_gedcom_id = :tree_id'.
-            '       AND sosa.majs_user_id = :user_id'.
-            '       AND sosa.majs_gen >=  :gen'.
-            '       AND (sosa_fat.majs_i_id IS NULL OR sosa_mot.majs_i_id IS NULL)'.
-            '   GROUP BY sosa.majs_gen, root_ancestor'.
-            ' ) AS stats_by_gen'.
-            ' INNER JOIN `##maj_sosa` sosa_list ON sosa_list.majs_gedcom_id = stats_by_gen.majs_gedcom_id'.
-            '   AND sosa_list.majs_user_id = stats_by_gen.majs_user_id'.
-            '   AND sosa_list.majs_sosa = stats_by_gen.root_ancestor'.
-            ' GROUP BY stats_by_gen.root_ancestor, sosa_list.majs_i_id'.
-            ' ORDER BY stats_by_gen.root_ancestor')
-        ->execute(array(
-            'tree_id' => $this->tree->getTreeId(),
-            'user_id' => $this->user->getUserId(),
-            'gen' => $gen
-        ))->fetchAll() ?: array();
+	/**
+	 * Get the total Sosa count for all generations
+	 *
+	 * @return number Number of Sosas
+	 */
+	public function getSosaCount(){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId() 
+			))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the number of Sosa in a specific generation.
+	 *
+	 * @param number $gen Generation
+	 * @return number Number of Sosas in generation
+	 */
+	public function getSosaCountAtGeneration($gen){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen= :gen')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen            
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the total number of Sosa up to a specific generation.
+	 *
+	 * @param number $gen Generation
+	 * @return number Total number of Sosas up to generation
+	 */
+	public function getSosaCountUpToGeneration($gen){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen <= :gen')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen 
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the total number of distinct Sosa individual for all generations.
+	 *
+	 * @return number Total number of distinct individual
+	 */
+	public function getDifferentSosaCount(){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the number of distinct Sosa individual up to a specific generation.
+	 *
+	 * @param number $gen Generation
+	 * @return number Number of distinct Sosa individuals up to generation
+	 */
+	public function getDifferentSosaCountUpToGeneration($gen){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen <= :gen')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen 
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get an array of birth statistics for a specific generation
+	 * Statistics are :
+	 * 	- first : First birth year in generation
+	 *  - first_est: First estimated birth year in generation
+	 *  - last : Last birth year in generation
+	 *  - last_est : Last estimated birth year in generation
+	 *  - avg : Average birth year (based on non-estimated birth date)
+	 *
+	 * @param number $gen Generation
+	 * @return array Birth statistics array
+	 */
+	public function getStatsBirthYearInGeneration($gen){
+		if(!$this->is_setup) return array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
+		return Database::prepare(
+			'SELECT'.
+			' MIN(majs_birth_year) AS first, MIN(majs_birth_year_est) AS first_est,'.
+			' AVG(majs_birth_year) AS avg,'.
+			' MAX(majs_birth_year) AS last, MAX(majs_birth_year_est) AS last_est'.
+			' FROM `##maj_sosa`'.
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen=:gen')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen))
+			->fetchOneRow(\PDO::FETCH_ASSOC) ?: array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
+	}
+    
+	/**
+	 * Get the mean generation time, based on a linear regression of birth years and generations
+	 *
+	 * @return number|NULL Mean generation time
+	 */
+	public function getMeanGenerationTime(){
+		if(!$this->is_setup) return;
+		if(!$this->statistics_tab){
+			$this->getStatisticsByGeneration();
+		}
+		//Linear regression on x=generation and y=birthdate
+		$sum_xy = $sum_x = $sum_y= $sum_x2 = $n = 0;
+		foreach($this->statistics_tab as $gen=>$stats){
+			if(!is_null($stats['avgBirth'])) {
+				$n++;
+				$sum_xy+=$gen*$stats['avgBirth'];
+				$sum_x+=$gen;
+				$sum_y+=$stats['avgBirth'];
+				$sum_x2+=$gen*$gen;
+			}
+		}
+		$denom=($n*$sum_x2)-($sum_x*$sum_x);
+		if($denom!=0){
+			return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
+		}
+		return null;
+	}
+    
+	/**
+	 * Return an array 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: array
+	 *      - root_ancestor_id : ID of the ancestor
+	 *      - mean_gen_depth : Mean generation depth
+	 *      - stddev_gen_depth : Standard deviation of generation depth
+	 *  
+	 * @param number $gen Sosa generation
+	 * @return array
+	 */
+	public function getGenerationDepthStatsAtGen($gen) {
+		if(!$this->is_setup) return array();
+		$gen_depth_stats_raw = Database::prepare(
+			'SELECT stats_by_gen.root_ancestor AS root_ancestor_sosa,'.
+			'   sosa_list.majs_i_id as root_ancestor_id,'.
+			'   1 + SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))) AS mean_gen_depth,'.
+			'   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'.
+			' FROM('.
+			'   SELECT'.
+			'       sosa.majs_gedcom_id,'.
+			'       sosa.majs_user_id,'.
+			'       sosa.majs_gen - :gen AS majs_gen_norm,'.
+			'       FLOOR(((sosa.majs_sosa / POW(2, sosa.majs_gen -1 )) - 1) * POWER(2, :gen - 1)) + POWER(2, :gen - 1) AS root_ancestor,'.
+			'       SUM(case when sosa_fat.majs_i_id IS NULL AND sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count,'.
+			'       SUM(case when sosa_fat.majs_i_id IS NULL AND sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count'.
+			'   FROM `##maj_sosa` AS sosa'.
+			'   LEFT JOIN `##maj_sosa` AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.
+			'       AND sosa_fat.majs_gedcom_id = sosa.majs_gedcom_id'.
+			'       AND sosa_fat.majs_user_id = sosa.majs_user_id'.
+			'   LEFT JOIN `##maj_sosa` AS sosa_mot ON sosa_mot.majs_sosa = 2 * sosa.majs_sosa + 1'.
+			'       AND sosa_mot.majs_gedcom_id = sosa.majs_gedcom_id'.
+			'       AND sosa_mot.majs_user_id = sosa.majs_user_id'.
+			'   WHERE sosa.majs_gedcom_id = :tree_id'.
+			'       AND sosa.majs_user_id = :user_id'.
+			'       AND sosa.majs_gen >=  :gen'.
+			'       AND (sosa_fat.majs_i_id IS NULL OR sosa_mot.majs_i_id IS NULL)'.
+			'   GROUP BY sosa.majs_gen, root_ancestor'.
+			' ) AS stats_by_gen'.
+			' INNER JOIN `##maj_sosa` sosa_list ON sosa_list.majs_gedcom_id = stats_by_gen.majs_gedcom_id'.
+			'   AND sosa_list.majs_user_id = stats_by_gen.majs_user_id'.
+			'   AND sosa_list.majs_sosa = stats_by_gen.root_ancestor'.
+			' GROUP BY stats_by_gen.root_ancestor, sosa_list.majs_i_id'.
+			' ORDER BY stats_by_gen.root_ancestor')
+		->execute(array(
+			'tree_id' => $this->tree->getTreeId(),
+			'user_id' => $this->user->getUserId(),
+			'gen' => $gen
+		))->fetchAll() ?: array();
         
-        $gen_depth_stats = array();
-        foreach ($gen_depth_stats_raw as $gen_depth_stat) {
-            $gen_depth_stats[$gen_depth_stat->root_ancestor_sosa] = array(
-                'root_ancestor_id' => $gen_depth_stat->root_ancestor_id,
-                'mean_gen_depth' => $gen_depth_stat->mean_gen_depth,
-                'stddev_gen_depth' => $gen_depth_stat->stddev_gen_depth
-            );
-        }
-        return $gen_depth_stats;
-    }
-    
-    /**
-     * Return a computed array of statistics about the dispersion of ancestors across the ancestors
-     * at a specified generation.
-     * This statistics cannot be used for generations above 11, as it would cause a out of range in MySQL
-     * 
-     * Format: 
-     *  - key : a base-2 representation of the ancestor at generation G for which exclusive ancestors have been found,
-     *          -1 is used for shared ancestors
-     *          For instance base2(0100) = base10(4) represent the maternal grand father
-     *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
-     *  
-     *  For instance a result at generation 3 could be :
-     *      array (   -1        =>  12      -> 12 ancestors are shared by the grand-parents
-     *                base10(1) =>  32      -> 32 ancestors are exclusive to the paternal grand-father
-     *                base10(2) =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
-     *                base10(4) =>  12      -> 12 ancestors are exclusive to the maternal grand-father
-     *                base10(8) =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
-     *            )
-     *  
-     * @param int $gen Reference generation
-     * @return array
-     */
-    public function getAncestorDispersionForGen($gen) {
-        if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
-        return Database::prepare(
-            'SELECT branches, count(i_id)'.
-            ' FROM ('.
-            '   SELECT i_id,'.
-            '       CASE'.
-            '           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
-            '           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
-            '       END branches'.
-            '   FROM ('.
-            '       SELECT DISTINCT majs_i_id i_id,'.
-            '           POW(2, FLOOR(majs_sosa / POW(2, (majs_gen - :gen))) - POW(2, :gen -1)) branch'.
-            '       FROM `##maj_sosa`'.
-            '       WHERE majs_gedcom_id = :tree_id AND majs_user_id = :user_id'.
-            '           AND majs_gen >= :gen'.
-            '   ) indistat'.
-            '   GROUP BY i_id'.
-            ') grouped'.
-            ' GROUP BY branches')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen
-            ))->fetchAssoc() ?: array();
-    }
-    
-    /**
-     * Return an array 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: 
-     *  - key : root Sosa individual
-     *  - value: number of duplications of the ancestor (e.g. 3 if it appears 3 times)
-     * 
-     * @param number $limit Maximum number of individuals to return
-     * @return array 
-     */
-    public function getTopMultiSosaAncestorsNoTies($limit) {
-        if(!$this->is_setup) return array();
-        return Database::prepare(
-            'SELECT sosa_i_id, sosa_count FROM ('.
-            '   SELECT'.
-            '       top_sosa.sosa_i_id, top_sosa.sosa_count, top_sosa.sosa_min,'.
-            '       @keep := IF(@prev_count = 0 OR sosa_count = @prev_count, @keep, 1) AS keep,'.
-            '       @prev_count := top_sosa.sosa_count AS prev_count'.
-            '   FROM ('.
-            '       SELECT'.
-            '           sosa.majs_i_id sosa_i_id,'.
-            '           COUNT(sosa.majs_sosa) sosa_count,'.
-            '           MIN(sosa.majs_sosa) sosa_min'.
-            '       FROM ##maj_sosa AS sosa'.
-            '       LEFT JOIN ##maj_sosa AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.   // Link to sosa's father
-            '           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
-            '           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
-            '       LEFT JOIN ##maj_sosa AS sosa_mot on sosa_mot.majs_sosa = (2 * sosa.majs_sosa + 1)'.  // Link to sosa's mother
-            '           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
-            '           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
-            '       WHERE sosa.majs_gedcom_id = :tree_id'.
-            '       AND sosa.majs_user_id = :user_id'.
-            '       AND sosa_fat.majs_sosa IS NULL'.    // We keep only root individuals, i.e. those with no father or mother
-            '       AND sosa_mot.majs_sosa IS NULL'. 
-            '       GROUP BY sosa.majs_i_id'.
-            '       HAVING COUNT(sosa.majs_sosa) > 1'.   // Limit to the duplicate sosas.
-            '       ORDER BY COUNT(sosa.majs_sosa) DESC'.
-            '       LIMIT ' . ($limit + 1) . // We want to select one more than required
-            '   ) AS top_sosa,'.
-            '   (SELECT @prev_count := 0, @keep := 0) x'.
-            '   ORDER BY top_sosa.sosa_count ASC'.
-            ' ) top_sosa_list'.
-            ' WHERE keep = 1'.
-            ' ORDER BY sosa_count DESC, sosa_min ASC'
-            )->execute(array(
-                'tree_id' => $this->tree->getTreeId(),
-                'user_id' => $this->user->getUserId()
-            ))->fetchAssoc() ?: array();
-    }
+		$gen_depth_stats = array();
+		foreach ($gen_depth_stats_raw as $gen_depth_stat) {
+			$gen_depth_stats[$gen_depth_stat->root_ancestor_sosa] = array(
+				'root_ancestor_id' => $gen_depth_stat->root_ancestor_id,
+				'mean_gen_depth' => $gen_depth_stat->mean_gen_depth,
+				'stddev_gen_depth' => $gen_depth_stat->stddev_gen_depth
+			);
+		}
+		return $gen_depth_stats;
+	}
+    
+	/**
+	 * Return a computed array of statistics about the dispersion of ancestors across the ancestors
+	 * at a specified generation.
+	 * This statistics cannot be used for generations above 11, as it would cause a out of range in MySQL
+	 * 
+	 * Format: 
+	 *  - key : a base-2 representation of the ancestor at generation G for which exclusive ancestors have been found,
+	 *          -1 is used for shared ancestors
+	 *          For instance base2(0100) = base10(4) represent the maternal grand father
+	 *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
+	 *  
+	 *  For instance a result at generation 3 could be :
+	 *      array (   -1        =>  12      -> 12 ancestors are shared by the grand-parents
+	 *                base10(1) =>  32      -> 32 ancestors are exclusive to the paternal grand-father
+	 *                base10(2) =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
+	 *                base10(4) =>  12      -> 12 ancestors are exclusive to the maternal grand-father
+	 *                base10(8) =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
+	 *            )
+	 *  
+	 * @param int $gen Reference generation
+	 * @return array
+	 */
+	public function getAncestorDispersionForGen($gen) {
+		if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
+		return Database::prepare(
+			'SELECT branches, count(i_id)'.
+			' FROM ('.
+			'   SELECT i_id,'.
+			'       CASE'.
+			'           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
+			'           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
+			'       END branches'.
+			'   FROM ('.
+			'       SELECT DISTINCT majs_i_id i_id,'.
+			'           POW(2, FLOOR(majs_sosa / POW(2, (majs_gen - :gen))) - POW(2, :gen -1)) branch'.
+			'       FROM `##maj_sosa`'.
+			'       WHERE majs_gedcom_id = :tree_id AND majs_user_id = :user_id'.
+			'           AND majs_gen >= :gen'.
+			'   ) indistat'.
+			'   GROUP BY i_id'.
+			') grouped'.
+			' GROUP BY branches')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen
+			))->fetchAssoc() ?: array();
+	}
+    
+	/**
+	 * Return an array 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: 
+	 *  - key : root Sosa individual
+	 *  - value: number of duplications of the ancestor (e.g. 3 if it appears 3 times)
+	 * 
+	 * @param number $limit Maximum number of individuals to return
+	 * @return array 
+	 */
+	public function getTopMultiSosaAncestorsNoTies($limit) {
+		if(!$this->is_setup) return array();
+		return Database::prepare(
+			'SELECT sosa_i_id, sosa_count FROM ('.
+			'   SELECT'.
+			'       top_sosa.sosa_i_id, top_sosa.sosa_count, top_sosa.sosa_min,'.
+			'       @keep := IF(@prev_count = 0 OR sosa_count = @prev_count, @keep, 1) AS keep,'.
+			'       @prev_count := top_sosa.sosa_count AS prev_count'.
+			'   FROM ('.
+			'       SELECT'.
+			'           sosa.majs_i_id sosa_i_id,'.
+			'           COUNT(sosa.majs_sosa) sosa_count,'.
+			'           MIN(sosa.majs_sosa) sosa_min'.
+			'       FROM ##maj_sosa AS sosa'.
+			'       LEFT JOIN ##maj_sosa AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.   // Link to sosa's father
+			'           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
+			'           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
+			'       LEFT JOIN ##maj_sosa AS sosa_mot on sosa_mot.majs_sosa = (2 * sosa.majs_sosa + 1)'.  // Link to sosa's mother
+			'           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
+			'           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
+			'       WHERE sosa.majs_gedcom_id = :tree_id'.
+			'       AND sosa.majs_user_id = :user_id'.
+			'       AND sosa_fat.majs_sosa IS NULL'.    // We keep only root individuals, i.e. those with no father or mother
+			'       AND sosa_mot.majs_sosa IS NULL'. 
+			'       GROUP BY sosa.majs_i_id'.
+			'       HAVING COUNT(sosa.majs_sosa) > 1'.   // Limit to the duplicate sosas.
+			'       ORDER BY COUNT(sosa.majs_sosa) DESC'.
+			'       LIMIT ' . ($limit + 1) . // We want to select one more than required
+			'   ) AS top_sosa,'.
+			'   (SELECT @prev_count := 0, @keep := 0) x'.
+			'   ORDER BY top_sosa.sosa_count ASC'.
+			' ) top_sosa_list'.
+			' WHERE keep = 1'.
+			' ORDER BY sosa_count DESC, sosa_min ASC'
+			)->execute(array(
+				'tree_id' => $this->tree->getTreeId(),
+				'user_id' => $this->user->getUserId()
+			))->fetchAssoc() ?: array();
+	}
     
                
 }

Spacing +81 added lines, -81 removed lines

@@ -84,18 +84,18 @@ 
      * @param User $user
      */
     public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_user === null) 
+        if (self::$default_user === null) 
             self::$default_user = User::find(-1);
         
         $this->tree = $tree;
         $this->user = $user;
         $this->is_setup = true;
-        if($this->user === null) $this->user = Auth::user();
-        if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
+        if ($this->user === null) $this->user = Auth::user();
+        if (strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
         
         // Check if the user, or the default user, has a root already setup;
-        if(empty($this->getRootIndiId())) {
-            if($this->user == self::$default_user) {  // If the default user is not setup
+        if (empty($this->getRootIndiId())) {
+            if ($this->user == self::$default_user) {  // If the default user is not setup
                 $this->is_setup = false;
             }
             else {
@@ -145,7 +145,7 @@ 
      */
     public function getRootIndi() {
         $root_indi_id = $this->getRootIndiId();
-        if(!empty($root_indi_id)) {
+        if (!empty($root_indi_id)) {
             return Individual::getInstance($root_indi_id, $this->tree);
         }
         return null;
@@ -159,7 +159,7 @@ 
      * Remove all Sosa entries related to the gedcom file and user
      */
     public function deleteAll() {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
@@ -175,12 +175,12 @@ 
      * @param int $sosa
      */
     public function deleteAncestors($sosa) {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         $gen = Functions::getGeneration($sosa);
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
-            ' AND majs_gen >= :gen' .
+            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id'.
+            ' AND majs_gen >= :gen'.
             ' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
         )->execute(array(
             'tree_id' => $this->tree->getTreeId(), 
@@ -195,7 +195,7 @@ 
      * @param array $sosa_records
      */
     public function insertOrUpdate($sosa_records) {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         
         $treeid = $this->tree->getTreeId();
         $userid = $this->user->getUserId();
@@ -203,9 +203,9 @@ 
         $values_table = array();
         
         $i = 0;
-        foreach  ($sosa_records as $row) {
+        foreach ($sosa_records as $row) {
             $gen = Functions::getGeneration($row['sosa']);
-            if($gen <= self::MAX_DB_GENERATIONS) {
+            if ($gen <= self::MAX_DB_GENERATIONS) {
                 $questionmarks_table[] = 
                     '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
                 $values_table = array_merge(
@@ -226,9 +226,9 @@ 
             $i++;
         }
         
-        $sql = 'REPLACE INTO `##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(',', $questionmarks_table);
+        $sql = 'REPLACE INTO `##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(',', $questionmarks_table);
         Database::prepare($sql)->execute($values_table);
     }
     
@@ -244,7 +244,7 @@ 
      * @return array Array of sosa numbers
      */
     public function getSosaNumbers(Individual $indi) {
-        if(!$this->is_setup) return array();
+        if (!$this->is_setup) return array();
         return Database::prepare(
                 'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
                 ' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
@@ -261,7 +261,7 @@ 
      * @return number Last generation if found, 1 otherwise
      */
     public function getLastGeneration() {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         return Database::prepare(
                 'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
                 ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
@@ -280,13 +280,13 @@ 
      *
      * @return array Associative array of Sosa ancestors, with their generation, comma separated
      */
-    public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
+    public function getAllSosaWithGenerations() {
+        if (!$this->is_setup) return array();
         return Database::prepare(
-            'SELECT majs_i_id AS indi,' .
-            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
-            ' FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
+            'SELECT majs_i_id AS indi,'.
+            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations'.
+            ' FROM `##maj_sosa`'.
+            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' GROUP BY majs_i_id'
         )->execute(array(
             'tree_id' => $this->tree->getTreeId(),
@@ -300,13 +300,13 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa individuals
      */
-    public function getSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_list_by_gen)
+    public function getSosaListAtGeneration($gen) {
+        if (!$this->is_setup) return array();
+        if (!$this->sosa_list_by_gen)
             $this->sosa_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_list_by_gen[$gen])){
+        if ($gen) {
+            if (!isset($this->sosa_list_by_gen[$gen])) {
                 $this->sosa_list_by_gen[$gen] = Database::prepare(
                     'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
                     ' FROM `##maj_sosa`'.
@@ -331,13 +331,13 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa families
      */
-    public function getFamilySosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_fam_list_by_gen)
+    public function getFamilySosaListAtGeneration($gen) {
+        if (!$this->is_setup) return array();
+        if (!$this->sosa_fam_list_by_gen)
             $this->sosa_fam_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_fam_list_by_gen[$gen])){
+        if ($gen) {
+            if (!isset($this->sosa_fam_list_by_gen[$gen])) {
                 $this->sosa_fam_list_by_gen[$gen] = Database::prepare(
                     'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
                     ' FROM `##families`'.
@@ -367,9 +367,9 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa individuals
      */
-    public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
-        if($gen){
+    public function getMissingSosaListAtGeneration($gen) {
+        if (!$this->is_setup) return array();    
+        if ($gen) {
             return $this->sosa_list_by_gen[$gen] = Database::prepare(
                 'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
                 ' FROM `##maj_sosa` schild'.
@@ -408,10 +408,10 @@ 
      * @return array Statistics array
      */
     public function getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
-        if(!$this->statistics_tab) {
+        if (!$this->is_setup) return array();
+        if (!$this->statistics_tab) {
             $this->statistics_tab = array();
-            if($maxGeneration = $this->getLastGeneration()) {
+            if ($maxGeneration = $this->getLastGeneration()) {
                 for ($gen = 1; $gen <= $maxGeneration; $gen++) {
                     $birthStats = $this->getStatsBirthYearInGeneration($gen);
                     $this->statistics_tab[$gen] = array(
@@ -436,9 +436,9 @@ 
 	 * @return int
 	 */
 	public function getTotalIndividuals() {
-	    if(!$this->is_setup) return 0;
+	    if (!$this->is_setup) return 0;
 	    return Database::prepare(
-	        'SELECT COUNT(*) FROM `##individuals`' .
+	        'SELECT COUNT(*) FROM `##individuals`'.
 	        ' WHERE i_file = :tree_id')
 	        ->execute(array('tree_id' => $this->tree->getTreeId()))
 	        ->fetchOne() ?: 0;
@@ -449,10 +449,10 @@ 
      *
      * @return number Number of Sosas
      */
-    public function getSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
             ->execute(array(
                 'tree_id' => $this->tree->getTreeId(), 
@@ -466,10 +466,10 @@ 
      * @param number $gen Generation
      * @return number Number of Sosas in generation
      */
-    public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountAtGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen= :gen')
         ->execute(array(
@@ -485,10 +485,10 @@ 
      * @param number $gen Generation
      * @return number Total number of Sosas up to generation
      */
-    public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen <= :gen')
         ->execute(array(
@@ -503,10 +503,10 @@ 
      *
      * @return number Total number of distinct individual
      */
-    public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
         ->execute(array(
                 'tree_id' => $this->tree->getTreeId(), 
@@ -520,10 +520,10 @@ 
      * @param number $gen Generation
      * @return number Number of distinct Sosa individuals up to generation
      */
-    public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen <= :gen')
         ->execute(array(
@@ -545,8 +545,8 @@ 
      * @param number $gen Generation
      * @return array Birth statistics array
      */
-    public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
+    public function getStatsBirthYearInGeneration($gen) {
+        if (!$this->is_setup) return array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
         return Database::prepare(
             'SELECT'.
             ' MIN(majs_birth_year) AS first, MIN(majs_birth_year_est) AS first_est,'.
@@ -567,25 +567,25 @@ 
      *
      * @return number|NULL Mean generation time
      */
-    public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
-        if(!$this->statistics_tab){
+    public function getMeanGenerationTime() {
+        if (!$this->is_setup) return;
+        if (!$this->statistics_tab) {
             $this->getStatisticsByGeneration();
         }
         //Linear regression on x=generation and y=birthdate
-        $sum_xy = $sum_x = $sum_y= $sum_x2 = $n = 0;
-        foreach($this->statistics_tab as $gen=>$stats){
-            if(!is_null($stats['avgBirth'])) {
+        $sum_xy = $sum_x = $sum_y = $sum_x2 = $n = 0;
+        foreach ($this->statistics_tab as $gen=>$stats) {
+            if (!is_null($stats['avgBirth'])) {
                 $n++;
-                $sum_xy+=$gen*$stats['avgBirth'];
-                $sum_x+=$gen;
-                $sum_y+=$stats['avgBirth'];
-                $sum_x2+=$gen*$gen;
+                $sum_xy += $gen * $stats['avgBirth'];
+                $sum_x += $gen;
+                $sum_y += $stats['avgBirth'];
+                $sum_x2 += $gen * $gen;
             }
         }
-        $denom=($n*$sum_x2)-($sum_x*$sum_x);
-        if($denom!=0){
-            return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
+        $denom = ($n * $sum_x2) - ($sum_x * $sum_x);
+        if ($denom != 0) {
+            return -(($n * $sum_xy) - ($sum_x * $sum_y)) / ($denom);
         }
         return null;
     }
@@ -609,7 +609,7 @@ 
      * @return array
      */
     public function getGenerationDepthStatsAtGen($gen) {
-        if(!$this->is_setup) return array();
+        if (!$this->is_setup) return array();
         $gen_depth_stats_raw = Database::prepare(
             'SELECT stats_by_gen.root_ancestor AS root_ancestor_sosa,'.
             '   sosa_list.majs_i_id as root_ancestor_id,'.
@@ -684,14 +684,14 @@ 
      * @return array
      */
     public function getAncestorDispersionForGen($gen) {
-        if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
+        if (!$this->is_setup || $gen > 11) return array(); // Going further than 11 gen will be out of range in the query
         return Database::prepare(
             'SELECT branches, count(i_id)'.
             ' FROM ('.
             '   SELECT i_id,'.
             '       CASE'.
             '           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
-            '           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
+            '           ELSE -1'.// We put all ancestors shared between some branches in the same bucket
             '       END branches'.
             '   FROM ('.
             '       SELECT DISTINCT majs_i_id i_id,'.
@@ -724,7 +724,7 @@ 
      * @return array 
      */
     public function getTopMultiSosaAncestorsNoTies($limit) {
-        if(!$this->is_setup) return array();
+        if (!$this->is_setup) return array();
         return Database::prepare(
             'SELECT sosa_i_id, sosa_count FROM ('.
             '   SELECT'.
@@ -737,20 +737,20 @@ 
             '           COUNT(sosa.majs_sosa) sosa_count,'.
             '           MIN(sosa.majs_sosa) sosa_min'.
             '       FROM ##maj_sosa AS sosa'.
-            '       LEFT JOIN ##maj_sosa AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.   // Link to sosa's father
+            '       LEFT JOIN ##maj_sosa AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.// Link to sosa's father
             '           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
             '           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
-            '       LEFT JOIN ##maj_sosa AS sosa_mot on sosa_mot.majs_sosa = (2 * sosa.majs_sosa + 1)'.  // Link to sosa's mother
+            '       LEFT JOIN ##maj_sosa AS sosa_mot on sosa_mot.majs_sosa = (2 * sosa.majs_sosa + 1)'.// Link to sosa's mother
             '           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
             '           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
             '       WHERE sosa.majs_gedcom_id = :tree_id'.
             '       AND sosa.majs_user_id = :user_id'.
-            '       AND sosa_fat.majs_sosa IS NULL'.    // We keep only root individuals, i.e. those with no father or mother
+            '       AND sosa_fat.majs_sosa IS NULL'.// We keep only root individuals, i.e. those with no father or mother
             '       AND sosa_mot.majs_sosa IS NULL'. 
             '       GROUP BY sosa.majs_i_id'.
-            '       HAVING COUNT(sosa.majs_sosa) > 1'.   // Limit to the duplicate sosas.
+            '       HAVING COUNT(sosa.majs_sosa) > 1'.// Limit to the duplicate sosas.
             '       ORDER BY COUNT(sosa.majs_sosa) DESC'.
-            '       LIMIT ' . ($limit + 1) . // We want to select one more than required
+            '       LIMIT '.($limit + 1).// We want to select one more than required
             '   ) AS top_sosa,'.
             '   (SELECT @prev_count := 0, @keep := 0) x'.
             '   ORDER BY top_sosa.sosa_count ASC'.