Merge pull request #193 from ptorrestr/get-literal-info

Get literal info

Author: LaurensRietveld

.gitignore

@@ -1,5 +1,6 @@
 # Others
 *~
+.ycm_extra_conf.py
 # vim
 *.swp
 

libhdt/include/Dictionary.hpp

@@ -116,6 +116,12 @@ class Dictionary
     /* Return the number of different objects of the current dictionary */
     virtual size_t getNobjects()=0;
 
+    /* return the number of different literal objects of the current dictionary*/
+    virtual size_t getNobjectsLiterals()=0;
+
+    /* return the number of different non-literal objects of the current dictionary*/
+    virtual size_t getNobjectsNotLiterals()=0;
+
     /* Return the number of shared subjects-objects of the current dictionary */
     virtual size_t getNshared()=0;
 

libhdt/presets/dictionaryfour.hdtcfg

@@ -0,0 +1,4 @@
+dictionary.type <http://purl.org/HDT/hdt#dictionaryFour>
+triples.type <http://purl.org/HDT/hdt#triplesBitmap>
+triplesOrder SPO
+dict.block.size 32

libhdt/presets/dictionaryliteral.hdtcfg

@@ -0,0 +1,3 @@
+dictionary.type <http://purl.org/HDT/hdt#dictionaryLiteral>
+triples.type <http://purl.org/HDT/hdt#triplesBitmap>
+triplesOrder SPO

libhdt/presets/ops.hdtcfg

@@ -0,0 +1,3 @@
+dictionary.type <http://purl.org/HDT/hdt#dictionaryFour>
+triples.type <http://purl.org/HDT/hdt#triplesBitmap>
+triplesOrder OPS

libhdt/presets/wrong_dictionaryfour.hdtcfg

@@ -0,0 +1,4 @@
+dictionary.type <http://purl.org/HDT/hdt#dictionaryFour>
+triples.type <http://purl.org/HDT/hdt#triplesBitmap>
+triplesOrder SPO
+dict.block.size 0

libhdt/src/dictionary/FourSectionDictionary.cpp

@@ -58,11 +58,16 @@ FourSectionDictionary::FourSectionDictionary(HDTSpecification & spec) : blocksiz
 
 	string blockSizeStr = "";
 	try{
-		spec.get("dict.block.size");
+		blockSizeStr = spec.get("dict.block.size");
 	}catch(exception& e){}
 
-	if(blockSizeStr!=""){
-		//blocksize = atoi((const char*)blockSizeStr.c_str());
+	if(!blockSizeStr.empty() && (blockSizeStr.find_first_not_of("0123456789") == string::npos))
+	{
+		blocksize = std::stoi( blockSizeStr );
+		if ( blocksize <= 0 )
+		{
+			throw std::runtime_error("blocksize must be greater than 0");
+		}
 	}
 }
 
@@ -378,6 +383,12 @@ size_t FourSectionDictionary::getNpredicates(){
 size_t FourSectionDictionary::getNobjects(){
 	return shared->getLength()+objects->getLength();
 }
+size_t FourSectionDictionary::getNobjectsLiterals() {
+	throw std::logic_error("Not implemented");
+}
+size_t FourSectionDictionary::getNobjectsNotLiterals() {
+	throw std::logic_error("Not implemented");
+}
 size_t FourSectionDictionary::getNshared(){
 	return shared->getLength();
 }

libhdt/src/dictionary/FourSectionDictionary.hpp

@@ -69,6 +69,8 @@ class FourSectionDictionary : public Dictionary {
     size_t getNsubjects();
     size_t getNpredicates();
     size_t getNobjects();
+    size_t getNobjectsLiterals();
+    size_t getNobjectsNotLiterals();
     size_t getNshared();
 
     size_t getMaxID();

libhdt/src/dictionary/LiteralDictionary.cpp

@@ -506,6 +506,13 @@ size_t LiteralDictionary::getNshared() {
 	return shared->getLength();
 }
 
+size_t LiteralDictionary::getNobjectsLiterals() {
+	return objectsLiterals -> getLength();
+}
+
+size_t LiteralDictionary::getNobjectsNotLiterals() {
+	return objectsNotLiterals -> getLength();
+}
 size_t LiteralDictionary::getMaxID() {
     size_t s = subjects->getLength();
     size_t o = objectsLiterals->getLength()+objectsNotLiterals->getLength();

libhdt/src/dictionary/PlainDictionary.cpp

@@ -663,6 +663,14 @@ size_t PlainDictionary::getNobjects() {
 	return shared.size()+objects.size();
 }
 
+size_t PlainDictionary::getNobjectsLiterals() {
+	throw std::logic_error("Not implemented");
+}
+
+size_t PlainDictionary::getNobjectsNotLiterals() {
+	throw std::logic_error("Not implemented");
+}
+
 size_t PlainDictionary::getNshared() {
 	return shared.size();
 }