Merge pull request #146 from OpenTriply/remove-CompactTriples

Remove compact triples

Author: LaurensRietveld

hdt-it/hdt-it_es.ts

@@ -270,11 +270,6 @@ p, li { white-space: pre-wrap; }
         <source>PlainTriples</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="hdtspecform.ui" line="179"/>
-        <source>CompactTriples</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="hdtspecform.ui" line="188"/>
         <source>SPO</source>

hdt-it/hdtspecform.cpp

@@ -39,12 +39,6 @@ void HDTSpecForm::on_triplesTypeCombo_currentIndexChanged(int index)
         ui->streamYcombo->setEnabled(true);
         ui->streamZcombo->setEnabled(true);
         break;
-    case 3:
-        // CompactTriples
-        ui->streamXcombo->setEnabled(false);
-        ui->streamYcombo->setEnabled(true);
-        ui->streamZcombo->setEnabled(true);
-        break;
     case 4:
         // FoQTriples
         ui->streamXcombo->setEnabled(false);
@@ -146,10 +140,6 @@ void HDTSpecForm::fillHDTSpecification(hdt::HDTSpecification &hdt)
         // PlainTriples
         hdt.set("triples.type", hdt::HDTVocabulary::TRIPLES_TYPE_PLAIN);
         break;
-    case 3:
-        // CompactTriples
-        hdt.set("triples.type", hdt::HDTVocabulary::TRIPLES_TYPE_COMPACT);
-        break;
     }
 
     if(ui->streamXcombo->isEnabled()) {

hdt-it/hdtspecform.ui

@@ -182,11 +182,6 @@
             <string>PlainTriples</string>
            </property>
           </item>
-          <item>
-           <property name="text">
-            <string>CompactTriples</string>
-           </property>
-          </item>
          </widget>
         </item>
         <item row="1" column="1">

libhdt/Makefile.am

@@ -67,7 +67,6 @@ src/sparql/SortBinding.cpp \
 src/sparql/TriplePatternBinding.cpp \
 src/triples/BitmapTriples.cpp \
 src/triples/BitmapTriplesIterators.cpp \
-src/triples/CompactTriples.cpp \
 src/triples/PlainTriples.cpp \
 src/triples/predicateindex.cpp \
 src/triples/TripleIterators.cpp \
@@ -143,7 +142,6 @@ src/sparql/TriplePatternBinding.hpp\
 src/sparql/VarBindingInterface.hpp\
 src/sparql/VarFilterBinding.hpp\
 src/triples/BitmapTriples.hpp\
-src/triples/CompactTriples.hpp\
 src/triples/PlainTriples.hpp\
 src/triples/predicateindex.hpp\
 src/triples/TripleIterators.hpp\

libhdt/include/HDTVocabulary.hpp

@@ -108,7 +108,6 @@ namespace HDTVocabulary {
 	const std::string TRIPLES_TYPE_TRIPLESLIST = HDT_TRIPLES_BASE+"List>";
 	const std::string TRIPLES_TYPE_TRIPLESLISTDISK = HDT_TRIPLES_BASE+"ListDisk>";
 	const std::string TRIPLES_TYPE_PLAIN = HDT_TRIPLES_BASE+"Plain>";
-	const std::string TRIPLES_TYPE_COMPACT = HDT_TRIPLES_BASE+"Compact>";
 	const std::string TRIPLES_TYPE_BITMAP = HDT_TRIPLES_BASE+"Bitmap>";
 	const std::string TRIPLES_TYPE_KYOTO = HDT_TRIPLES_BASE+"KYOTO>";
 

libhdt/src/hdt/BasicHDT.cpp

@@ -58,7 +58,6 @@
 #endif
 
 #include "../triples/PlainTriples.hpp"
-#include "../triples/CompactTriples.hpp"
 #include "../triples/BitmapTriples.hpp"
 #include "../triples/TripleOrderConvert.hpp"
 
@@ -126,8 +125,6 @@ void BasicHDT::createComponents() {
 	}
 	if(triplesType==HDTVocabulary::TRIPLES_TYPE_BITMAP) {
 		triples = new BitmapTriples(spec);
-	} else if(triplesType==HDTVocabulary::TRIPLES_TYPE_COMPACT) {
-		triples = new CompactTriples(spec);
 	} else if(triplesType==HDTVocabulary::TRIPLES_TYPE_PLAIN) {
 		triples = new PlainTriples(spec);
 	} else if(triplesType==HDTVocabulary::TRIPLES_TYPE_TRIPLESLIST) {

libhdt/src/hdt/HDTFactory.cpp

@@ -46,7 +46,6 @@
 #include "../triples/TripleListDisk.hpp"
 #endif
 #include "../triples/PlainTriples.hpp"
-#include "../triples/CompactTriples.hpp"
 #include "../triples/BitmapTriples.hpp"
 
 
@@ -84,8 +83,6 @@ Triples *HDTFactory::readTriples(ControlInformation &controlInformation) {
 
 	if(triplesType==HDTVocabulary::TRIPLES_TYPE_BITMAP) {
 		return new BitmapTriples();
-	} else if(triplesType==HDTVocabulary::TRIPLES_TYPE_COMPACT) {
-		return new CompactTriples();
 	} else if(triplesType==HDTVocabulary::TRIPLES_TYPE_PLAIN) {
 		return new PlainTriples();
 	} else if(triplesType==HDTVocabulary::TRIPLES_TYPE_TRIPLESLIST) {