release 1.0.850

novak-jiri · Feb 21, 2018 · a49ebb1 · a49ebb1
1 parent 3e5d837
commit a49ebb1
Show file tree

Hide file tree

Showing 42 changed files with 3,925 additions and 1,020 deletions.
diff --git a/CycloBranch/CycloBranch.vcxproj b/CycloBranch/CycloBranch.vcxproj
@@ -157,9 +157,12 @@
     <ClCompile Include="core\cParameters.cpp" />
     <ClCompile Include="core\cPeak.cpp" />
     <ClCompile Include="core\cPeaksList.cpp" />
+    <ClCompile Include="core\cSequence.cpp" />
+    <ClCompile Include="core\cSequenceDatabase.cpp" />
     <ClCompile Include="core\cSummaryFormula.cpp" />
     <ClCompile Include="core\cTheoreticalSpectrum.cpp" />
     <ClCompile Include="core\cTheoreticalSpectrumList.cpp" />
+    <ClCompile Include="core\utilities.cpp" />
     <ClCompile Include="GeneratedFiles\Debug\moc_cAboutWidget.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -168,6 +171,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="GeneratedFiles\Debug\moc_cBricksDatabaseWidget.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_cCyclicWidget.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -208,6 +215,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="GeneratedFiles\Debug\moc_cSequenceDatabaseWidget.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_cSpectrumComparatorThread.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -224,6 +235,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="GeneratedFiles\Release\moc_cBricksDatabaseWidget.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_cCyclicWidget.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -264,6 +279,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="GeneratedFiles\Release\moc_cSequenceDatabaseWidget.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_cSpectrumComparatorThread.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -274,6 +293,7 @@
     </ClCompile>
     <ClCompile Include="gui\cAboutWidget.cpp" />
     <ClCompile Include="gui\cBranchedWidget.cpp" />
+    <ClCompile Include="gui\cBricksDatabaseWidget.cpp" />
     <ClCompile Include="gui\cCyclicWidget.cpp" />
     <ClCompile Include="gui\cFragmentIonsListWidget.cpp" />
     <ClCompile Include="gui\cGraphicalSpectrumWidget.cpp" />
@@ -283,6 +303,7 @@
     <ClCompile Include="gui\cMainThread.cpp" />
     <ClCompile Include="gui\cMainWindow.cpp" />
     <ClCompile Include="gui\cParametersWidget.cpp" />
+    <ClCompile Include="gui\cSequenceDatabaseWidget.cpp" />
     <ClCompile Include="gui\cSpectrumDetailWidget.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="parallel\cGraphReaderThread.cpp" />
@@ -299,8 +320,47 @@
     <ClInclude Include="core\cParameters.h" />
     <ClInclude Include="core\cPeak.h" />
     <ClInclude Include="core\cPeaksList.h" />
+    <ClInclude Include="core\cSequence.h" />
+    <ClInclude Include="core\cSequenceDatabase.h" />
     <ClInclude Include="core\cSummaryFormula.h" />
     <ClInclude Include="core\cTheoreticalSpectrum.h" />
+    <ClInclude Include="core\utilities.h" />
+    <CustomBuild Include="gui\cSequenceDatabaseWidget.h">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing cSequenceDatabaseWidget.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing cSequenceDatabaseWidget.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing cSequenceDatabaseWidget.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing cSequenceDatabaseWidget.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"</Command>
+    </CustomBuild>
+    <CustomBuild Include="gui\cBricksDatabaseWidget.h">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing cBricksDatabaseWidget.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing cBricksDatabaseWidget.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing cBricksDatabaseWidget.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing cBricksDatabaseWidget.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"</Command>
+    </CustomBuild>
     <CustomBuild Include="gui\cLassoWidget.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing cLassoWidget.h...</Message>

diff --git a/CycloBranch/CycloBranch.vcxproj.filters b/CycloBranch/CycloBranch.vcxproj.filters
@@ -212,6 +212,33 @@
     <ClCompile Include="core\cSummaryFormula.cpp">
       <Filter>Source Files\core</Filter>
     </ClCompile>
+    <ClCompile Include="gui\cBricksDatabaseWidget.cpp">
+      <Filter>Source Files\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Debug\moc_cBricksDatabaseWidget.cpp">
+      <Filter>Generated Files\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Release\moc_cBricksDatabaseWidget.cpp">
+      <Filter>Generated Files\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="core\cSequenceDatabase.cpp">
+      <Filter>Source Files\core</Filter>
+    </ClCompile>
+    <ClCompile Include="core\cSequence.cpp">
+      <Filter>Source Files\core</Filter>
+    </ClCompile>
+    <ClCompile Include="core\utilities.cpp">
+      <Filter>Source Files\core</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\cSequenceDatabaseWidget.cpp">
+      <Filter>Source Files\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Debug\moc_cSequenceDatabaseWidget.cpp">
+      <Filter>Generated Files\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Release\moc_cSequenceDatabaseWidget.cpp">
+      <Filter>Generated Files\Release</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="gui\cAboutWidget.h">
@@ -259,6 +286,12 @@
     <CustomBuild Include="gui\cLassoWidget.h">
       <Filter>Header Files\gui</Filter>
     </CustomBuild>
+    <CustomBuild Include="gui\cBricksDatabaseWidget.h">
+      <Filter>Header Files\gui</Filter>
+    </CustomBuild>
+    <CustomBuild Include="gui\cSequenceDatabaseWidget.h">
+      <Filter>Header Files\gui</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="core\cBrick.h">
@@ -297,5 +330,14 @@
     <ClInclude Include="core\cSummaryFormula.h">
       <Filter>Header Files\core</Filter>
     </ClInclude>
+    <ClInclude Include="core\cSequenceDatabase.h">
+      <Filter>Header Files\core</Filter>
+    </ClInclude>
+    <ClInclude Include="core\cSequence.h">
+      <Filter>Header Files\core</Filter>
+    </ClInclude>
+    <ClInclude Include="core\utilities.h">
+      <Filter>Header Files\core</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/CycloBranch/core/cBrick.cpp b/CycloBranch/core/cBrick.cpp
@@ -127,6 +127,7 @@ void cBrick::setSummary(string& summary) {
 
 
 void cBrick::setAcronyms(string& acronyms) {
+	this->acronyms.clear();
 	string s = "";
 	int i = 0;
 	while (i < (int)acronyms.size()) {
@@ -148,6 +149,7 @@ void cBrick::setAcronyms(string& acronyms) {
 
 
 void cBrick::setReferences(string& references) {
+	this->references.clear();
 	string s = "";
 	int i = 0;
 	while (i < (int)references.size()) {
@@ -235,6 +237,18 @@ string cBrick::getAcronymsAsString() {
 }
 
 
+string cBrick::getReferencesAsString() {
+	string s = "";
+	for (int i = 0; i < (int)references.size(); i++) {
+		s += references[i];
+		if (i < (int)references.size() - 1) {
+			s += "/";
+		}
+	}
+	return s;
+}
+
+
 string cBrick::getFirstAcronymAsString() {
 	if (acronyms.size() == 0) {
 		return "";
@@ -244,6 +258,10 @@ string cBrick::getFirstAcronymAsString() {
 
 
 string cBrick::getAcronymsWithReferencesAsHTMLString() {
+	if (acronyms.size() != references.size()) {
+		return "";
+	}
+
 	string s = "";
 	regex rx;
 	bool correctreference;
@@ -278,9 +296,9 @@ string cBrick::getAcronymsWithReferencesAsHTMLString() {
 
 			// PDB
 			if (!correctreference) {
-				rx = "^PDB: [A-Z]+$";
+				rx = "^PDB: ([A-Z]|[0-9])+$";
 				if (regex_search(references[i], rx)) {
-					s += "<a href=\"http://www.pdb.org/pdb/ligand/ligandsummary.do?hetId=" + references[i].substr(5) + "\">";
+					s += "<a href=\"http://www.ebi.ac.uk/pdbe-srv/pdbechem/chemicalCompound/show/" + references[i].substr(5) + "\">";
 					s += acronyms[i];
 					s += "</a>";
 					correctreference = true;
@@ -349,75 +367,23 @@ bool cBrick::isArtificial() {
 
 
 void cBrick::store(ofstream& os) {
-	int size;
-
-	size = (int)name.size();
-	os.write((char *)&size, sizeof(int));
-	os.write(name.c_str(), name.size());
-
-	size = (int)acronyms.size();
-	os.write((char *)&size, sizeof(int));
-	for (int i = 0; i < (int)acronyms.size(); i++) {
-		size = (int)acronyms[i].size();
-		os.write((char *)&size, sizeof(int));
-		os.write(acronyms[i].c_str(), acronyms[i].size());
-	}
-
-	size = (int)references.size();
-	os.write((char *)&size, sizeof(int));
-	for (int i = 0; i < (int)references.size(); i++) {
-		size = (int)references[i].size();
-		os.write((char *)&size, sizeof(int));
-		os.write(references[i].c_str(), references[i].size());
-	}
-
-	size = (int)summary.size();
-	os.write((char *)&size, sizeof(int));
-	os.write(summary.c_str(), summary.size());
-
+	storeString(name, os);
+	storeStringVector(acronyms, os);
+	storeStringVector(references, os);
+	storeString(summary, os);
 	os.write((char *)&mass, sizeof(double));
-
-	size = (int)composition.size();
-	os.write((char *)&size, sizeof(int));
-	os.write(composition.c_str(), composition.size());
-
+	storeString(composition, os);
 	os.write((char *)&artificial, sizeof(bool));
 }
 
 
 void cBrick::load(ifstream& is) {
-	int size;
-
-	is.read((char *)&size, sizeof(int));
-	name.resize(size);
-	is.read(&name[0], name.size());
-
-	is.read((char *)&size, sizeof(int));
-	acronyms.resize(size);
-	for (int i = 0; i < (int)acronyms.size(); i++) {
-		is.read((char *)&size, sizeof(int));
-		acronyms[i].resize(size);
-		is.read(&acronyms[i][0], acronyms[i].size());
-	}
-
-	is.read((char *)&size, sizeof(int));
-	references.resize(size);
-	for (int i = 0; i < (int)references.size(); i++) {
-		is.read((char *)&size, sizeof(int));
-		references[i].resize(size);
-		is.read(&references[i][0], references[i].size());
-	}
-
-	is.read((char *)&size, sizeof(int));
-	summary.resize(size);
-	is.read(&summary[0], summary.size());
-
+	loadString(name, is);
+	loadStringVector(acronyms, is);
+	loadStringVector(references, is);
+	loadString(summary, is);
 	is.read((char *)&mass, sizeof(double));
-
-	is.read((char *)&size, sizeof(int));
-	composition.resize(size);
-	is.read(&composition[0], composition.size());
-
+	loadString(composition, is);
 	is.read((char *)&artificial, sizeof(bool));
 }
 
diff --git a/CycloBranch/core/cBrick.h b/CycloBranch/core/cBrick.h
@@ -13,6 +13,7 @@
 #include <vector>
 #include <algorithm>
 #include <regex>
+#include "core/utilities.h"
 
 using namespace std;
 
@@ -185,6 +186,13 @@ class cBrick {
 	string getAcronymsAsString();
 
 
+	/**
+		\brief Get all references.
+		\retval string references of all izomers separated by '/'
+	*/ 
+	string getReferencesAsString();
+
+
 	/**
 		\brief Get the first acronym.
 		\retval string acronym of the first izomer