Skip to content

Commit

Permalink
Merge branch 'master' into public
Browse files Browse the repository at this point in the history
  • Loading branch information
marekkokot committed Feb 9, 2024
2 parents 9cd471f + fdd179e commit d6c24dc
Show file tree
Hide file tree
Showing 107 changed files with 216 additions and 216 deletions.
4 changes: 2 additions & 2 deletions kmc_api/kmc_file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#include "mmer.h"
Expand Down
4 changes: 2 additions & 2 deletions kmc_api/kmc_file.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _KMC_FILE_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_api/kmer_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz and Agnieszka Debudaj-Grabysz
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#include "kmer_api.h"
Expand Down
4 changes: 2 additions & 2 deletions kmc_api/kmer_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ The homepage of the KMC project is http://sun.aei.polsl.pl/kmc
Authors: Sebastian Deorowicz and Agnieszka Debudaj-Grabysz
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _KMER_API_H
Expand Down
8 changes: 4 additions & 4 deletions kmc_api/kmer_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz and Agnieszka Debudaj-Grabysz
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/


Expand All @@ -14,8 +14,8 @@

#include <cinttypes>

#define KMC_VER "3.2.3"
#define KMC_DATE "2023-12-08"
#define KMC_VER "3.2.4"
#define KMC_DATE "2024-02-09"

#ifndef MIN
#define MIN(x,y) ((x) < (y) ? (x) : (y))
Expand Down
4 changes: 2 additions & 2 deletions kmc_api/mmer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#include "../kmc_api/mmer.h"
Expand Down
4 changes: 2 additions & 2 deletions kmc_api/mmer.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _MMER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/bam_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ The homepage of the KMC project is http://sun.aei.polsl.pl/kmc
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _BAM_UTILS_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/binary_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ The homepage of the KMC project is http://sun.aei.polsl.pl/kmc
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _BINARY_READER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/bkb_merger.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _HBH_MERGER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/bkb_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#include "bkb_reader.h"
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/bkb_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ The homepage of the KMC project is http://sun.aei.polsl.pl/kmc
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _BKB_READER_H_
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/bkb_sorter.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _BKB_SORTER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/bkb_subbin.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _BKB_SUBBIN_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/bkb_uncompactor.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _BKB_UNCOMPACTOR_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/bkb_writer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#include "bkb_writer.h"
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/bkb_writer.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _BKB_WRITER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/cpu_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#include "cpu_info.h"
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/cpu_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _CPU_INFO_
Expand Down
8 changes: 4 additions & 4 deletions kmc_core/defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _DEFS_H
#define _DEFS_H

#include <cinttypes>

#define KMC_VER "3.2.3"
#define KMC_DATE "2023-12-08"
#define KMC_VER "3.2.4"
#define KMC_DATE "2024-02-09"

#define _CRT_SECURE_NO_WARNINGS

Expand Down
4 changes: 2 additions & 2 deletions kmc_core/fastq_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/
#include <algorithm>
#include "defs.h"
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/fastq_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _FASTQ_READER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/first_dispatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ The homepage of the KMC project is http://sun.aei.polsl.pl/kmc
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/
#ifndef _FIRST_DISPATCH_H
#define _FIRST_DISPATCH_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/intr_copy.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _INTR_COPY_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kb_collector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ The homepage of the KMC project is http://sun.aei.polsl.pl/kmc
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#include "kb_collector.h"
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kb_collector.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _KB_COLLECTOR_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kb_completer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/
#include <algorithm>
#include <numeric>
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kb_completer.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/
#ifndef _KB_COMPLETER_H
#define _KB_COMPLETER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kb_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _KB_READER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kb_sorter.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _KB_SORTER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kb_storer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/
#include <algorithm>
#include <numeric>
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kb_storer.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _KB_STORER_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#ifndef _KMC_H
Expand Down
4 changes: 2 additions & 2 deletions kmc_core/kmc_runner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Authors: Sebastian Deorowicz, Agnieszka Debudaj-Grabysz, Marek Kokot
Version: 3.2.3
Date : 2023-12-08
Version: 3.2.4
Date : 2024-02-09
*/

#include "kmc_runner.h"
Expand Down
Loading

0 comments on commit d6c24dc

Please sign in to comment.