[Genabel-commits] r1921 - branches/ProbABEL-pvals/ProbABEL/src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Feb 19 12:32:57 CET 2015
Author: lckarssen
Date: 2015-02-19 12:32:57 +0100 (Thu, 19 Feb 2015)
New Revision: 1921
Modified:
branches/ProbABEL-pvals/ProbABEL/src/command_line_settings.cpp
branches/ProbABEL-pvals/ProbABEL/src/command_line_settings.h
branches/ProbABEL-pvals/ProbABEL/src/coxph_data.cpp
branches/ProbABEL-pvals/ProbABEL/src/coxph_data.h
branches/ProbABEL-pvals/ProbABEL/src/eigen_mematrix.cpp
branches/ProbABEL-pvals/ProbABEL/src/eigen_mematrix.h
branches/ProbABEL-pvals/ProbABEL/src/gendata.cpp
branches/ProbABEL-pvals/ProbABEL/src/gendata.h
branches/ProbABEL-pvals/ProbABEL/src/invsigma.cpp
branches/ProbABEL-pvals/ProbABEL/src/invsigma.h
branches/ProbABEL-pvals/ProbABEL/src/main.cpp
branches/ProbABEL-pvals/ProbABEL/src/main_functions_dump.cpp
branches/ProbABEL-pvals/ProbABEL/src/main_functions_dump.h
branches/ProbABEL-pvals/ProbABEL/src/maskedmatrix.cpp
branches/ProbABEL-pvals/ProbABEL/src/maskedmatrix.h
branches/ProbABEL-pvals/ProbABEL/src/mlinfo.cpp
branches/ProbABEL-pvals/ProbABEL/src/mlinfo.h
branches/ProbABEL-pvals/ProbABEL/src/phedata.cpp
branches/ProbABEL-pvals/ProbABEL/src/phedata.h
branches/ProbABEL-pvals/ProbABEL/src/reg1.cpp
branches/ProbABEL-pvals/ProbABEL/src/reg1.h
branches/ProbABEL-pvals/ProbABEL/src/regdata.cpp
branches/ProbABEL-pvals/ProbABEL/src/regdata.h
branches/ProbABEL-pvals/ProbABEL/src/testchol.cpp
branches/ProbABEL-pvals/ProbABEL/src/usage.cpp
branches/ProbABEL-pvals/ProbABEL/src/usage.h
branches/ProbABEL-pvals/ProbABEL/src/utilities.cpp
branches/ProbABEL-pvals/ProbABEL/src/utilities.h
Log:
Merged ProbABEL trunk r1914:1920 into the ProbABEL-pvals branch.
Modified: branches/ProbABEL-pvals/ProbABEL/src/command_line_settings.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/command_line_settings.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/command_line_settings.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/command_line_settings.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/command_line_settings.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/command_line_settings.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/coxph_data.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/coxph_data.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/coxph_data.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/coxph_data.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/coxph_data.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/coxph_data.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -12,7 +12,7 @@
* Created on: Mar 31, 2012
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/eigen_mematrix.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/eigen_mematrix.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/eigen_mematrix.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/eigen_mematrix.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/eigen_mematrix.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/eigen_mematrix.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/gendata.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/gendata.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/gendata.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/gendata.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/gendata.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/gendata.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/invsigma.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/invsigma.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/invsigma.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -6,7 +6,7 @@
*/
/*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/invsigma.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/invsigma.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/invsigma.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* \brief Contains the definition of the InvSigma class.
*/
/*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/main.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/main.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/main.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -35,7 +35,7 @@
/*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/main_functions_dump.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/main_functions_dump.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/main_functions_dump.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -14,7 +14,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/main_functions_dump.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/main_functions_dump.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/main_functions_dump.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/maskedmatrix.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/maskedmatrix.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/maskedmatrix.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/maskedmatrix.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/maskedmatrix.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/maskedmatrix.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/mlinfo.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/mlinfo.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/mlinfo.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -6,7 +6,7 @@
*/
/*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/mlinfo.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/mlinfo.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/mlinfo.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -8,7 +8,7 @@
* .mlinfo files.
*
*/
-/* Copyright (C) 2009--2014 Various members of the GenABEL team. See
+/* Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/phedata.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/phedata.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/phedata.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/phedata.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/phedata.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/phedata.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/reg1.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/reg1.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/reg1.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -9,7 +9,7 @@
*/
/*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/reg1.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/reg1.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/reg1.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -9,7 +9,7 @@
* \brief Describes various classes containing regression objects.
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/regdata.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/regdata.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/regdata.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -12,7 +12,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/regdata.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/regdata.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/regdata.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -12,7 +12,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/testchol.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/testchol.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/testchol.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/usage.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/usage.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/usage.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/usage.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/usage.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/usage.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/utilities.cpp
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/utilities.cpp 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/utilities.cpp 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
Modified: branches/ProbABEL-pvals/ProbABEL/src/utilities.h
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/utilities.h 2015-02-19 10:51:02 UTC (rev 1920)
+++ branches/ProbABEL-pvals/ProbABEL/src/utilities.h 2015-02-19 11:32:57 UTC (rev 1921)
@@ -5,7 +5,7 @@
* Author: mkooyman
*
*
- * Copyright (C) 2009--2014 Various members of the GenABEL team. See
+ * Copyright (C) 2009--2015 Various members of the GenABEL team. See
* the SVN commit logs for more details.
*
* This program is free software; you can redistribute it and/or
More information about the Genabel-commits
mailing list