Wycięcie multi-fasta-split.

Wycięcie > z nazw w log duplikatów

Author: sebastiandeorowicz

makefile

@@ -1,4 +1,4 @@
-all: mfasta-tool multi-fasta-split
+all: mfasta-tool
 
 # *** REFRESH makefile utils
 include refresh.mk
@@ -36,19 +36,8 @@ endif
 
 # *** Source files and rules
 $(eval $(call PREPARE_DEFAULT_COMPILE_RULE,MFASTA_TOOL,mfasta-tool))
-$(eval $(call PREPARE_DEFAULT_COMPILE_RULE,MULTI_FASTA_SPLIT,multi-fasta-split))
 
 # *** Targets
-multi-fasta-split: $(OUT_BIN_DIR)/multi-fasta-split
-
-$(OUT_BIN_DIR)/multi-fasta-split: $(GZ_TARGET) mimalloc_obj libdeflate \
-	$(OBJ_MULTI_FASTA_SPLIT) 
-	-mkdir -p $(OUT_BIN_DIR)	
-	$(CXX) -o $@  \
-	$(MIMALLOC_OBJ) \
-	$(OBJ_MULTI_FASTA_SPLIT) \
-	$(LIBRARY_FILES) $(LINKER_FLAGS) $(LINKER_DIRS)
-
 mfasta-tool:  $(OUT_BIN_DIR)/mfasta-tool
 
 $(OUT_BIN_DIR)/mfasta-tool: $(GZ_TARGET) mimalloc_obj libdeflate \

ref-utils.sln

@@ -12,11 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfasta-tool", "src\mfasta-t
 		{153220B9-5A09-4C86-886D-3CA399125A45} = {153220B9-5A09-4C86-886D-3CA399125A45}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi-fasta-split", "src\multi-fasta-split\multi-fasta-split.vcxproj", "{6A85A95A-ECEE-4853-982D-9B740903C19B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{153220B9-5A09-4C86-886D-3CA399125A45} = {153220B9-5A09-4C86-886D-3CA399125A45}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_prebuild", "src\_prebuild\_prebuild.vcxproj", "{153220B9-5A09-4C86-886D-3CA399125A45}"
 EndProject
 Global
@@ -79,22 +74,6 @@ Global
 		{8EC48DCD-BCB8-4898-AA4B-B9308ECBF615}.RelWithDebInfo|x64.Build.0 = Release|x64
 		{8EC48DCD-BCB8-4898-AA4B-B9308ECBF615}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
 		{8EC48DCD-BCB8-4898-AA4B-B9308ECBF615}.RelWithDebInfo|x86.Build.0 = Release|Win32
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.Debug|x64.ActiveCfg = Debug|x64
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.Debug|x64.Build.0 = Debug|x64
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.Debug|x86.ActiveCfg = Debug|Win32
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.Debug|x86.Build.0 = Debug|Win32
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.MinSizeRel|x64.Build.0 = Debug|x64
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.MinSizeRel|x86.ActiveCfg = Debug|Win32
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.MinSizeRel|x86.Build.0 = Debug|Win32
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.Release|x64.ActiveCfg = Release|x64
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.Release|x64.Build.0 = Release|x64
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.Release|x86.ActiveCfg = Release|Win32
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.Release|x86.Build.0 = Release|Win32
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
-		{6A85A95A-ECEE-4853-982D-9B740903C19B}.RelWithDebInfo|x86.Build.0 = Release|Win32
 		{153220B9-5A09-4C86-886D-3CA399125A45}.Debug|x64.ActiveCfg = Debug|x64
 		{153220B9-5A09-4C86-886D-3CA399125A45}.Debug|x64.Build.0 = Debug|x64
 		{153220B9-5A09-4C86-886D-3CA399125A45}.Debug|x86.ActiveCfg = Debug|Win32

src/mfasta-tool/sha256_filter.h

@@ -214,7 +214,7 @@ class CSHA256Filter
 			{
 				if (is_first)
 				{
-					ofs << di.second;
+					ofs << string_view(di.second.begin() + 1, di.second.end());
 					is_first = false;
 					is_first_fwd = di.first;
 				}
@@ -223,7 +223,7 @@ class CSHA256Filter
 					ofs << " ";
 					if (mark_duplicates_orientation)
 						ofs << ((is_first_fwd ^ di.first) ? "+" : "-");
-					ofs << di.second;
+					ofs << string_view(di.second.begin() + 1, di.second.end());
 				}
 			}