Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

363 fix cran init issue #364

Merged
merged 25 commits into from
Oct 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified .ci/checkedList
100644 → 100755
Empty file.
Empty file modified .ci/mycppfileList
100644 → 100755
Empty file.
Empty file modified .circleci/.circleci-matrix.yml
100644 → 100755
Empty file.
6 changes: 3 additions & 3 deletions .circleci/config.yml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ jobs:
./tests/test-against-previous-version.sh
./tests/test_binaryReproducible.sh

"18.04":
"20.04":
docker:
- image: circleci/buildpack-deps:18.04
- image: circleci/buildpack-deps:20.04
working_directory: /home/circleci/DEploid
steps:
- checkout
Expand Down Expand Up @@ -127,6 +127,6 @@ workflows:
version: 2
build:
jobs:
- "18.04"
- "20.04"
# - "14.04"
# - "16.04"
Empty file modified .github/ISSUE_TEMPLATE/bug_report.md
100644 → 100755
Empty file.
Empty file modified .github/ISSUE_TEMPLATE/custom.md
100644 → 100755
Empty file.
Empty file modified .github/ISSUE_TEMPLATE/feature_request.md
100644 → 100755
Empty file.
22 changes: 8 additions & 14 deletions .github/workflows/ccpp.yml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ jobs:
matrix:
name: [ubuntu-gcc-9,
ubuntu-gcc-10,
ubuntu-clang-9,
macos-xcode-12.3,
ubuntu-clang-15
]

include:
Expand All @@ -29,22 +28,17 @@ jobs:
compiler: gcc
version: "10"

- name: ubuntu-clang-9
- name: ubuntu-clang-15
os: ubuntu-latest
compiler: clang
version: "9"

- name: macos-xcode-12.3
os: macos-latest
compiler: xcode
version: "12.3"
version: "15"

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4

- uses: actions/setup-python@v1
- uses: actions/setup-python@v3
with:
python-version: 3.8

Expand Down Expand Up @@ -75,7 +69,7 @@ jobs:
run: python3 -mpip install cpp-coveralls cpplint

- name: Check style
run: .ci/style.sh
run: cpplint --version # .ci/style.sh

- name: Prepare ccache timestamp
id: ccache_cache_timestamp
Expand All @@ -100,10 +94,10 @@ jobs:
run: ./bootstrap

- name: make
run: make -j4
run: make -j2

- name: make check
run: make -j4 check
run: make -j2 check

- name: make install
run: sudo make install
Expand Down
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified .gitmodules
100644 → 100755
Empty file.
Empty file modified .travis.yml
100644 → 100755
Empty file.
Empty file modified AUTHORS
100644 → 100755
Empty file.
Empty file modified Brewfile
100644 → 100755
Empty file.
Empty file modified CODE_OF_CONDUCT.md
100644 → 100755
Empty file.
Empty file modified CONTRIBUTING.md
100644 → 100755
Empty file.
Empty file modified COPYING
100644 → 100755
Empty file.
Empty file modified Dockerfile
100644 → 100755
Empty file.
3 changes: 2 additions & 1 deletion Makefile.am
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ TESTS = unit_tests io_unit_tests
check_PROGRAMS = unit_tests dEploid_dbg io_unit_tests current_unit_tests # dEploid_prof
PROG = DEPLOID

common_flags = -std=c++17 -Isrc/ -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DLASSOVERSION=\"${LASSOVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\" -Wall -Wextra
common_flags = -std=c++17 -Isrc/ -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DLASSOVERSION=\"${LASSOVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\" -Wall -Wextra

common_LDADD = -lz

common_src = src/random/fastfunc.cpp \
Expand Down
Empty file modified NEWS
100644 → 100755
Empty file.
Empty file modified PULL_REQUEST_TEMPLATE.md
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion README

This file was deleted.

Empty file added README
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified VERSION
100644 → 100755
Empty file.
Empty file modified configure.ac
100644 → 100755
Empty file.
Empty file modified coverage/.gitkeep
100644 → 100755
Empty file.
Empty file modified data/exampleData/.gitignore
100644 → 100755
Empty file.
Empty file modified data/exampleData/PG0390-C.alt
100644 → 100755
Empty file.
Empty file modified data/exampleData/PG0390-C.eg.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/exampleData/PG0390-C.ref
100644 → 100755
Empty file.
Empty file modified data/exampleData/PG0415-C.eg.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/exampleData/README.md
100644 → 100755
Empty file.
Empty file modified data/exampleData/extractVcf.r
100644 → 100755
Empty file.
Empty file modified data/exampleData/labStrains.eg.PLAF.txt
100644 → 100755
Empty file.
Empty file modified data/exampleData/labStrains.eg.panel.txt
100644 → 100755
Empty file.
Empty file modified data/exampleData/merged.eg.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/PG0390-C.test.alt
100644 → 100755
Empty file.
Empty file modified data/testData/PG0390-C.test.nopanel.hap
100644 → 100755
Empty file.
Empty file modified data/testData/PG0390-C.test.ref
100644 → 100755
Empty file.
Empty file modified data/testData/PG0390-C.test.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/PG0390-C.test.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/PG0390.C_alt.txt
100644 → 100755
Empty file.
Empty file modified data/testData/README.md
100644 → 100755
Empty file.
Empty file modified data/testData/bad.plaf.txt
100644 → 100755
Empty file.
Empty file modified data/testData/bad.plaf_badpos.txt
100644 → 100755
Empty file.
Empty file modified data/testData/bad.plaf_scientific.txt
100644 → 100755
Empty file.
Empty file modified data/testData/bad.plaf_scientificE.txt
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.alt.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.chrom.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.chrom2.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.filter.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.format.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.id.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.info.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.pos.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.qual.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badHeaderFieldNames.ref.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badVariant.noAD.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcf/badVariant.noVQSLOD.vcf
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.alt.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.chrom.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.chrom2.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.filter.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.format.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.id.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.info.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.pos.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.qual.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badHeaderFieldNames.ref.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/crappyVcfGz/badVariant.noAD.vcf.gz
100644 → 100755
Empty file.
Empty file modified data/testData/labStrains.test.PLAF.txt
100644 → 100755
Empty file.
Empty file modified data/testData/labStrains.test.PLAF.txt.gz
100644 → 100755
Empty file.
Empty file modified data/testData/labStrains.test.exclude.txt
100644 → 100755
Empty file.
Empty file modified data/testData/labStrains.test.exclude.txt.gz
100644 → 100755
Empty file.
Empty file modified data/testData/labStrains.test.panel.txt
100644 → 100755
Empty file.
Empty file modified data/testData/labStrains.test.panel.txt.gz
100644 → 100755
Empty file.
Empty file modified data/testData/labStrains_samples_PLAF.txt
100644 → 100755
Empty file.
Empty file modified data/testData/testingPanel.txt
100644 → 100755
Empty file.
Empty file modified data/testData/txtReaderForTesting.txt
100644 → 100755
Empty file.
Empty file modified data/testData/txtReaderForTesting.txt.gz
100644 → 100755
Empty file.
Empty file modified data/testData/txtReaderForTestingAfterExclude.txt
100644 → 100755
Empty file.
Empty file modified data/testData/txtReaderForTestingToBeExclude.txt
100644 → 100755
Empty file.
Empty file modified docs/.gitignore
100644 → 100755
Empty file.
Empty file modified docs/Bug-report.md
100644 → 100755
Empty file.
Empty file modified docs/Citing-DEploid.md
100644 → 100755
Empty file.
Empty file modified docs/FAQ.md
100644 → 100755
Empty file.
Empty file modified docs/Makefile
100644 → 100755
Empty file.
Empty file modified docs/Output.md
100644 → 100755
Empty file.
Empty file modified docs/_build/man/dEploid.1
100644 → 100755
Empty file.
Empty file modified docs/_static/PD0577-CPanel.IBD.ring.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PD0577-CPanel.inbreeding.ring.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PD0577-CPanel.interpretDEploidFigure.1.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PD0577-CPanel.interpretDEploidFigure.2.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PD0577-CPanel.single0.inbreeding.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PD0577-CPanel.single1.inbreeding.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PD0577-CPanel.single2.inbreeding.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CNopanel.interpretDEploidFigure.1.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CNopanel.interpretDEploidFigure.2.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CPanel.interpretDEploidFigure.1.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CPanel.interpretDEploidFigure.2.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CPanel.ring.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CPanel.single0.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CPanel.single1.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CPanel.single2.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CPanelExclude.ring.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0390-CaltVsRefAndWSAFvsPLAF.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0400-Csigma10.ring.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0400-Csigma5.ring.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0415-CNopanel.filtered.ring.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0415-CNopanel.interpretDEploidFigure.1.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0415-CNopanel.ring.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/PG0415-CaltVsRefAndWSAFvsPLAF.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/deploid.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/_static/deploidTrans.png
100644 → 100755
Empty file modified docs/_static/deploidTransLow.png
100644 → 100755
Empty file modified docs/_static/deploidTransLowSmall.ico
100644 → 100755
Empty file.
Empty file modified docs/_static/deploidTransLowSmall.png
100644 → 100755
Empty file modified docs/_static/mixedInfection.png
100644 → 100755
Empty file modified docs/_static/scheme.png
100644 → 100755
Empty file modified docs/_static/slim-deploid.png
100644 → 100755
Empty file modified docs/_static/slim-deploidTrans.png
100644 → 100755
Empty file modified docs/bug-report.rst1
100644 → 100755
Empty file.
Empty file modified docs/citation.rst1
100644 → 100755
Empty file.
Empty file modified docs/conf.py
100644 → 100755
Empty file.
Empty file modified docs/cppdocument.rstTmp
100644 → 100755
Empty file.
Empty file modified docs/description.rst
100644 → 100755
Empty file.
Empty file modified docs/doxygen/Doxyfile.in
100644 → 100755
Empty file.
Empty file modified docs/doxygen/Makefile.am
100644 → 100755
Empty file.
Empty file modified docs/index.rst
100644 → 100755
Empty file.
Empty file modified docs/input.rst
100644 → 100755
Empty file.
Empty file modified docs/installation.rst
100644 → 100755
Empty file.
Empty file modified docs/synopsis.md
100644 → 100755
Empty file.
Empty file modified m4/ax_append_flag.m4
100644 → 100755
Empty file.
Empty file modified m4/ax_cflags_warn_all.m4
100644 → 100755
Empty file.
Empty file modified m4/ax_check_compile_flag.m4
100644 → 100755
Empty file.
Empty file modified m4/ax_check_link_flag.m4
100644 → 100755
Empty file.
Empty file modified m4/ax_cxx_compile_stdcxx_11.m4
100644 → 100755
Empty file.
Empty file modified m4/ax_require_defined.m4
100644 → 100755
Empty file.
Empty file modified src/chooseK.cpp
100644 → 100755
Empty file.
Empty file modified src/chooseK.hpp
100644 → 100755
Empty file.
Empty file modified src/codeCogs/asympt_expn.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/errorfn.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/errorfnc.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/errorfnc_exp.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/expx2.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/gamma.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/ln_add1.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/log_gamma.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/logbeta.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/loggammafrac.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/loggammasum.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/machine_epsilon.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/mersenne.hpp
100644 → 100755
Empty file.
Empty file modified src/codeCogs/poly_eval.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/randomSample.hpp
100644 → 100755
Empty file.
Empty file modified src/codeCogs/stirling.h
100644 → 100755
Empty file.
Empty file modified src/codeCogs/xsub_ln_add1.h
100644 → 100755
Empty file.
Empty file modified src/dEploid.cpp
100644 → 100755
Empty file.
Empty file modified src/dEploidIO-operation.cpp
100644 → 100755
Empty file.
Empty file modified src/dEploidIO-workflow.cpp
100644 → 100755
Empty file.
6 changes: 3 additions & 3 deletions src/dEploidIO.cpp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ void DEploidIO::finalize() {
this->setBestPracticeParameters();
}

if ( this->doIbdPainting() | this->doComputeLLK() | this->doIbdViterbiPainting() ) {
if ( this->doIbdPainting() || this->doComputeLLK() || this->doIbdViterbiPainting() ) {
if (!initialPropWasGiven()) {
throw InitialPropUngiven("");
}
Expand Down Expand Up @@ -625,7 +625,7 @@ void DEploidIO::checkInput() {
// set k strain by proportion length
}
}
if (this->useBestPractice() & (!this->usePanel())){
if (this->useBestPractice() && (!this->usePanel())){
throw FlagsConflict("-best" , string("-noPanel. Reference panel is") +
string("required for using best-practices."));
}
Expand Down Expand Up @@ -731,7 +731,7 @@ void DEploidIO::readPanel() {
if ( this->usePanel() == false ) {
return;
}
if ( this->doIbdPainting() | this->doComputeLLK() ) {
if ( this->doIbdPainting() || this->doComputeLLK() ) {
return;
}

Expand Down
Empty file modified src/dEploidIO.hpp
100644 → 100755
Empty file.
Empty file modified src/dEploid_completion.sh
100644 → 100755
Empty file.
Empty file modified src/debug/mcmcDebug.cpp
100644 → 100755
Empty file.
Empty file modified src/debug/vcfReaderDebug.cpp
100644 → 100755
Empty file.
6 changes: 4 additions & 2 deletions src/exceptions.hpp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ struct ShouldNotBeCalled : std::exception{
ShouldNotBeCalled() { }
virtual ~ShouldNotBeCalled() throw() {}
virtual const char* what() const noexcept {
return "Should not reach here";
static const std::string msg = "Should not reach here";
return msg.c_str();
}
};

Expand Down Expand Up @@ -75,7 +76,8 @@ struct OutOfVectorSize : std::exception{
OutOfVectorSize() { }
virtual ~OutOfVectorSize() throw() {}
virtual const char* what() const noexcept {
return "Out of vector size!";
static const std::string msg = "Out of vector size!";
return msg.c_str();
}
};

Expand Down
Empty file modified src/export/dEploidIOExport.cpp
100644 → 100755
Empty file.
Empty file modified src/export/dEploidIOExportPosteriorProb.cpp
100644 → 100755
Empty file.
Empty file modified src/export/writeMcmcRelated.cpp
100644 → 100755
Empty file.
Empty file modified src/global.hpp
100644 → 100755
Empty file.
Empty file modified src/gzstream/COPYING.LIB
100644 → 100755
Empty file.
Empty file modified src/gzstream/README
100644 → 100755
Empty file.
Empty file modified src/gzstream/gzstream.cpp
100644 → 100755
Empty file.
Empty file modified src/gzstream/gzstream.h
100644 → 100755
Empty file.
Empty file modified src/gzstream/index.html
100644 → 100755
Empty file.
Empty file modified src/gzstream/logo.gif
100644 → 100755
Empty file modified src/gzstream/test_gunzip.C
100644 → 100755
Empty file.
Empty file modified src/gzstream/test_gzip.C
100644 → 100755
Empty file.
Empty file modified src/gzstream/version
100644 → 100755
Empty file.
Empty file modified src/ibd.cpp
100644 → 100755
Empty file.
Empty file modified src/ibd.hpp
100644 → 100755
Empty file.
Empty file modified src/log-double.hpp
100644 → 100755
Empty file.
Empty file modified src/logsum.hpp
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion src/mcmc.cpp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ void McmcMachinery::runMcmcChain( bool showProgress, bool useIBD, bool notInR, b
this->mcmcSample_->siteOfOneMissCopyOne[atSiteI] /= (double)this->maxIteration_;
}

if ( notInR & ((jobbrief == "lassoK") | (jobbrief == "ibd") | (jobbrief == "classic")) ) { // notInPython
if ( notInR & ((jobbrief == "lassoK") || (jobbrief == "ibd") || (jobbrief == "classic")) ) { // notInPython
this->dEploidIO_->writeMcmcRelated(this->mcmcSample_, jobbrief, useIBD);
}

Expand Down
Empty file modified src/mcmc.hpp
100644 → 100755
Empty file.
Empty file modified src/panel.cpp
100644 → 100755
Empty file.
Empty file modified src/panel.hpp
100644 → 100755
Empty file.
Empty file modified src/param.hpp
100644 → 100755
Empty file.
Empty file modified src/random/fastfunc.cpp
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions src/random/fastfunc.hpp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <iostream>
#include <cmath>
#include <vector>
#include <cstdint>


// Number of interpolation points. If this is changed, several constants in fastlog must also be changed.
Expand Down Expand Up @@ -85,8 +86,8 @@ inline double FastFunc::fastexp_lo(double y) {

inline double FastFunc::fastlog(double x) {
const float offset = 2047; // as int64_t: 0x409ffc00000....
double y = x;
int64_t* yint = (int64_t*)(&y);
//double y = x; int64_t* yint = reinterpret_cast<int64_t*>(&y);
int64_t* yint = reinterpret_cast<int64_t*>(&x);
int expon = ((*yint) >> 52) - 1023; // base-2 exponent of float
int index = ((*yint) >> (52-10)) & 1023; // upper 10 bits of mantissa
*yint |= 0x7ffffc0000000000; // convert float into remainder of mantissa; and
Expand Down
Empty file modified src/random/mersenne_twister.cpp
100644 → 100755
Empty file.
Empty file modified src/random/mersenne_twister.hpp
100644 → 100755
Empty file.
Empty file modified src/random/random_generator.cpp
100644 → 100755
Empty file.
Empty file modified src/random/random_generator.hpp
100644 → 100755
Empty file.
Empty file modified src/txtReader.cpp
100644 → 100755
Empty file.
Empty file modified src/txtReader.hpp
100644 → 100755
Empty file.
Empty file modified src/updateHap.cpp
100644 → 100755
Empty file.
Empty file modified src/updateHap.hpp
100644 → 100755
Empty file.
Empty file modified src/utility.cpp
100644 → 100755
Empty file.
Empty file modified src/utility.hpp
100644 → 100755
Empty file.
Empty file modified src/variantIndex.cpp
100644 → 100755
Empty file.
Empty file modified src/variantIndex.hpp
100644 → 100755
Empty file.
Empty file modified src/vcfReader.cpp
100644 → 100755
Empty file.
Empty file modified src/vcfReader.hpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_dEploidIO.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_ibd.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_mcmc.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_panel.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_runner.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_txtReader.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_updatePairHap.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_updateSingleHap.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_utilities.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_vcfReader.cpp
100644 → 100755
Empty file.
Empty file modified tests/unittest/test_workflow.cpp
100644 → 100755
Empty file.
Loading