Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
Already on GitHub? Sign in to your account
1.40.0 #351
Open
Commits
Show all changes
68 commits
Select commit
Hold shift + click to select a range
6fa006c
Adds Boost line to log file
mothur-westcott cb32bbf
Adding summary class
mothur-westcott 08da960
Working on unit testing
mothur-westcott 87ea1bb
Adds parallelized summary class
mothur-westcott 2c3bfb4
Adds summary file to summary class
mothur-westcott cc6699f
Fixes typos in chimera commands help
mothur-westcott 7719df7
Fixes make.file bug when full path is used
mothur-westcott 6a4070c
Adds contigsreport parameter to summary.seqs
mothur-westcott cff86ef
Adds align report parameter to summary.seqs
mothur-westcott 9d46741
Working on screen.seqs change
mothur-westcott 33693e5
Fixes name mismatch make.contigs gz files
mothur-westcott 1b0de01
Defaults flip=t in align.seqs
mothur-westcott 531c82f
Working on google test compile
mothur-westcott 497ffff
Merge pull request #322 from mothur/Summary_Class_319
mothur-westcott f403a82
Resolved test project linking issues
mothur-westcott 2bf703e
Ignores 'ignore' group in shhh.flows
mothur-westcott 9bfdd55
Allows for multiple char delim in make.contigs
mothur-westcott d0615d5
Removes couts
mothur-westcott 8003738
Removes dependency and simplifies calculator class
mothur-westcott ea7ff2f
Creates fn, fp, fpfn, mcc, ses,spec, tn, tp, tptn classes
mothur-westcott 81231f7
Removes calculator.cpp
mothur-westcott e01fc00
Organizes calcs
mothur-westcott e635fc4
Fixes printing issue for dereplicate=t
mothur-westcott 7b8a60b
Adds accuracy,f1score,fdr,npv,ppv calcs
mothur-westcott f080a68
Adds ClusterMetric class to cluster commands
mothur-westcott c4ed54f
Simplify opticlust source
mothur-westcott 51b19f3
Hardcodes input files for testing
mothur-westcott a51e42c
Fakes tp,tn,fp,fn
mothur-westcott a9bbfb8
Setup for test cluster calcs
mothur-westcott 92c5d76
Reducing dependancies in Testing
mothur-westcott 506a3e5
Test project changes
mothur-westcott b4a0069
Reduces dependancies TestOptimatrix
mothur-westcott b7c27e5
Minor testing fixes
mothur-westcott 6b25e3d
Fix to compile
mothur-westcott 53aafb2
Fix to compile
mothur-westcott 864e470
Reduces log file size in debug mode
mothur-westcott 498fcd7
Adds debug to opticlust
mothur-westcott bb26bf9
Adds fakes for optimatrix
mothur-westcott a43397c
Adds tests for opticluster
mothur-westcott 7159150
Adds tests for cluster calcs
mothur-westcott 20d167e
Simplifies trimOligos constructor
mothur-westcott 03d92cb
Working on adding fakeOligos
mothur-westcott 3b0c70f
Opti Improvements
mothur-westcott 2ad9cd3
WIP shared file data structure upgrade
mothur-westcott 998c363
Removes couts
mothur-westcott d780be0
Abort cluster if incorrect files for method
mothur-westcott d46aceb
Adds opti method to mgcluster
mothur-westcott 1971ad9
Code Cleanup
mothur-westcott 207f145
Merge branch 'mgcluster_opti_342' into 1.40.0
mothur-westcott 2ef4e6c
Conflict resolution
mothur-westcott 82e6259
Adds -03 to project
mothur-westcott 3e27e6f
Merge branch '1.40.0' into opti_improvements2
mothur-westcott ea71db7
Merge in 1.40.0 changes and resolve conflicts
mothur-westcott b86b3e2
Rewrite of shared file data structure
mothur-westcott 232c6f5
Bug Fix: start trimming extra base pcr.seqs
mothur-westcott d71221c
Make.sra - remove trailing spaces
mothur-westcott 10cdcbc
Adjusts maximum quality score
mothur-westcott d25f5da
Merge branch '1.40.0' into opti_improvements2
mothur-westcott 83b5b56
Creates SharedRabund class
mothur-westcott 357b380
Shared file data structure rewrite
mothur-westcott c0e36d6
Fixes bugs while testing shared file rewrite
mothur-westcott 4fbc5e1
WIP - testing shared file changes
mothur-westcott 04c1c99
Revert to previous
mothur-westcott 524bf4a
Fixes dot adjust for paired primers
mothur-westcott 6c9959c
Fixes while testing shared file change
mothur-westcott cde176a
Fixes while testing shared file change
mothur-westcott 7b05930
Fixes chimera.vsearch screen output
mothur-westcott fd928f0
Fixes current files saved by fastq.info
mothur-westcott
The table of contents is too big for display.
Large diffs are not rendered by default.
Oops, something went wrong.
| @@ -0,0 +1,69 @@ | ||
| +// Copyright 2015, Google Inc. | ||
| +// All rights reserved. | ||
| +// | ||
| +// Redistribution and use in source and binary forms, with or without | ||
| +// modification, are permitted provided that the following conditions are | ||
| +// met: | ||
| +// | ||
| +// * Redistributions of source code must retain the above copyright | ||
| +// notice, this list of conditions and the following disclaimer. | ||
| +// * Redistributions in binary form must reproduce the above | ||
| +// copyright notice, this list of conditions and the following disclaimer | ||
| +// in the documentation and/or other materials provided with the | ||
| +// distribution. | ||
| +// * Neither the name of Google Inc. nor the names of its | ||
| +// contributors may be used to endorse or promote products derived from | ||
| +// this software without specific prior written permission. | ||
| +// | ||
| +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| +// | ||
| +// Injection point for custom user configurations. | ||
| +// The following macros can be defined: | ||
| +// | ||
| +// Flag related macros: | ||
| +// GTEST_FLAG(flag_name) | ||
| +// GTEST_USE_OWN_FLAGFILE_FLAG_ - Define to 0 when the system provides its | ||
| +// own flagfile flag parsing. | ||
| +// GTEST_DECLARE_bool_(name) | ||
| +// GTEST_DECLARE_int32_(name) | ||
| +// GTEST_DECLARE_string_(name) | ||
| +// GTEST_DEFINE_bool_(name, default_val, doc) | ||
| +// GTEST_DEFINE_int32_(name, default_val, doc) | ||
| +// GTEST_DEFINE_string_(name, default_val, doc) | ||
| +// | ||
| +// Test filtering: | ||
| +// GTEST_TEST_FILTER_ENV_VAR_ - The name of an environment variable that | ||
| +// will be used if --GTEST_FLAG(test_filter) | ||
| +// is not provided. | ||
| +// | ||
| +// Logging: | ||
| +// GTEST_LOG_(severity) | ||
| +// GTEST_CHECK_(condition) | ||
| +// Functions LogToStderr() and FlushInfoLog() have to be provided too. | ||
| +// | ||
| +// Threading: | ||
| +// GTEST_HAS_NOTIFICATION_ - Enabled if Notification is already provided. | ||
| +// GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ - Enabled if Mutex and ThreadLocal are | ||
| +// already provided. | ||
| +// Must also provide GTEST_DECLARE_STATIC_MUTEX_(mutex) and | ||
| +// GTEST_DEFINE_STATIC_MUTEX_(mutex) | ||
| +// | ||
| +// GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks) | ||
| +// GTEST_LOCK_EXCLUDED_(locks) | ||
| +// | ||
| +// ** Custom implementation starts here ** | ||
| + | ||
| +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ | ||
| +#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ | ||
| + | ||
| +#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ |
| @@ -0,0 +1,42 @@ | ||
| +// Copyright 2015, Google Inc. | ||
| +// All rights reserved. | ||
| +// | ||
| +// Redistribution and use in source and binary forms, with or without | ||
| +// modification, are permitted provided that the following conditions are | ||
| +// met: | ||
| +// | ||
| +// * Redistributions of source code must retain the above copyright | ||
| +// notice, this list of conditions and the following disclaimer. | ||
| +// * Redistributions in binary form must reproduce the above | ||
| +// copyright notice, this list of conditions and the following disclaimer | ||
| +// in the documentation and/or other materials provided with the | ||
| +// distribution. | ||
| +// * Neither the name of Google Inc. nor the names of its | ||
| +// contributors may be used to endorse or promote products derived from | ||
| +// this software without specific prior written permission. | ||
| +// | ||
| +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| +// | ||
| +// This file provides an injection point for custom printers in a local | ||
| +// installation of gTest. | ||
| +// It will be included from gtest-printers.h and the overrides in this file | ||
| +// will be visible to everyone. | ||
| +// See documentation at gtest-printers.h for details on how to define a | ||
| +// custom printer. | ||
| +// | ||
| +// ** Custom implementation starts here ** | ||
| + | ||
| +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_ | ||
| +#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_ | ||
| + | ||
| +#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_ |
| @@ -0,0 +1,41 @@ | ||
| +// Copyright 2015, Google Inc. | ||
| +// All rights reserved. | ||
| +// | ||
| +// Redistribution and use in source and binary forms, with or without | ||
| +// modification, are permitted provided that the following conditions are | ||
| +// met: | ||
| +// | ||
| +// * Redistributions of source code must retain the above copyright | ||
| +// notice, this list of conditions and the following disclaimer. | ||
| +// * Redistributions in binary form must reproduce the above | ||
| +// copyright notice, this list of conditions and the following disclaimer | ||
| +// in the documentation and/or other materials provided with the | ||
| +// distribution. | ||
| +// * Neither the name of Google Inc. nor the names of its | ||
| +// contributors may be used to endorse or promote products derived from | ||
| +// this software without specific prior written permission. | ||
| +// | ||
| +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| +// | ||
| +// Injection point for custom user configurations. | ||
| +// The following macros can be defined: | ||
| +// | ||
| +// GTEST_OS_STACK_TRACE_GETTER_ - The name of an implementation of | ||
| +// OsStackTraceGetterInterface. | ||
| +// | ||
| +// ** Custom implementation starts here ** | ||
| + | ||
| +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_ | ||
| +#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_ | ||
| + | ||
| +#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_ |
| @@ -0,0 +1,28 @@ | ||
| +// | ||
| +// fakemcc.hpp | ||
| +// Mothur | ||
| +// | ||
| +// Created by Sarah Westcott on 4/18/17. | ||
| +// Copyright © 2017 Schloss Lab. All rights reserved. | ||
| +// | ||
| + | ||
| +#ifndef fakemcc_hpp | ||
| +#define fakemcc_hpp | ||
| + | ||
| +#include "mothurout.h" | ||
| + | ||
| + | ||
| +class FakeClusterCalcValues { | ||
| + | ||
| +public: | ||
| + | ||
| + FakeClusterCalcValues() { tp = 823; tn = 1944106; fp = 95; fn = 354; } | ||
| + ~FakeClusterCalcValues() {} | ||
| + | ||
| + long long tp, tn, fp, fn; | ||
| +}; | ||
| + | ||
| + | ||
| + | ||
| +#endif /* fakemcc_hpp */ | ||
| + |
| @@ -0,0 +1,54 @@ | ||
| +// | ||
| +// fakeoligos.h | ||
| +// Mothur | ||
| +// | ||
| +// Created by Sarah Westcott on 5/1/17. | ||
| +// Copyright © 2017 Schloss Lab. All rights reserved. | ||
| +// | ||
| + | ||
| +#ifndef fakeoligos_h | ||
| +#define fakeoligos_h | ||
| + | ||
| +#include "mothurout.h" | ||
| + | ||
| + | ||
| +class FakeOligos { | ||
| + | ||
| +public: | ||
| + | ||
| + FakeOligos() { | ||
| + bdiffs=1; pdiffs=2; rdiffs=0; ldiffs=0; sdiffs=0; | ||
| + | ||
| + //single | ||
| + primers["CCGTCAATTCMTTTRAGT"] = 0; | ||
| + barcodes["AATGGTAC"] = 0; //F003D000 | ||
| + barcodes["AACCTGGC"] = 1; //F003D002 | ||
| + barcodes["TTCGTGGC"] = 2; //F003D004 | ||
| + barcodes["TTCTTGAC"] = 3; //F003D006 | ||
| + barcodes["TTCGCGAC"] = 4; //F003D008 | ||
| + barcodes["TCCAGAAC"] = 5; //F003D142 | ||
| + barcodes["AAGGCCTC"] = 6; //F003D144 | ||
| + barcodes["TGACCGTC"] = 7; //F003D146 | ||
| + barcodes["AGGTTGTC"] = 8; //F003D148 | ||
| + barcodes["TGGTGAAC"] = 9; //F003D150 | ||
| + barcodes["AACCGTGTC"] = 10; //MOCK.GQY1XT001 | ||
| + | ||
| + | ||
| + } | ||
| + ~FakeOligos() {} | ||
| + | ||
| + int bdiffs, pdiffs, rdiffs, ldiffs, sdiffs; | ||
| + map<string, int> barcodes; | ||
| + map<string, int> primers; | ||
| + | ||
| + vector<string> revPrimer; | ||
| + vector<string> linker; | ||
| + vector<string> spacer; | ||
| + map<int, oligosPair> ipbarcodes; | ||
| + map<int, oligosPair> ipprimers; | ||
| + | ||
| +}; | ||
| + | ||
| + | ||
| + | ||
| +#endif /* fakeoligos_h */ |
| @@ -0,0 +1,42 @@ | ||
| +// | ||
| +// fakeoptimatrix.cpp | ||
| +// Mothur | ||
| +// | ||
| +// Created by Sarah Westcott on 4/20/17. | ||
| +// Copyright © 2017 Schloss Lab. All rights reserved. | ||
| +// | ||
| + | ||
| +#include "fakeoptimatrix.hpp" | ||
| + | ||
| +/***********************************************************************/ | ||
| +FakeOptiMatrix::FakeOptiMatrix() : OptiMatrix() { | ||
| + try { | ||
| + m = MothurOut::getInstance(); | ||
| + | ||
| + //create 10 singletons | ||
| + for (int i = 90; i < 100; i++) { singletons.push_back(toString(i)); } | ||
| + | ||
| + //create 90 non singletons | ||
| + for (int i = 0; i < 90; i++) { nameMap.push_back(toString(i)); } | ||
| + | ||
| + closeness.resize(90); | ||
| + int count = 0; | ||
| + for (int i = 0; i < 9; i++) { | ||
| + set<int> close; | ||
| + //create list of all sequences in this set | ||
| + for (int j = 0; j < 10; j++) { close.insert((j+count)); } | ||
| + | ||
| + for (set<int>::iterator it = close.begin(); it != close.end(); it++) { | ||
| + //add close sequences to each sequence in this set, do not include self | ||
| + for (int j = 0; j < 10; j++) { if ((j+count) != *it) { closeness[j+count].insert(*it); } } | ||
| + } | ||
| + count += 10; | ||
| + } | ||
| + } | ||
| + catch(exception& e) { | ||
| + m->errorOut(e, "FakeOptiMatrix", "FakeOptiMatrix"); | ||
| + exit(1); | ||
| + } | ||
| +} | ||
| +/***********************************************************************/ | ||
| + |
Oops, something went wrong.