v1.3b

- Upgraded version to 1.3b - Sanitized comparison between mapping pairs in prolongables check - Removed use of std::string::npos - nontrivial member is determined by arithmetic rather than counting - Fix isTrivial member of parihkVector for alphabet sizes greater than 2 - New and faster algorithm for counting occurences of a character in a word for a given alphabet - Added missing documentation to prefix.hpp - parihkVector::operator std::string() is now const - Removed comparison members of parihkVector to use the default instead.
jamesrswift · Jun 24, 2019 · 2c64e17 · 2c64e17
1 parent 2913e37
commit 2c64e17
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 2,789 deletions.
diff --git a/Doxyfile b/Doxyfile
diff --git a/Morphism/analysis/Mordreda.out b/Morphism/analysis/Mordreda.out
diff --git a/Morphism/output/MordecaiA.out b/Morphism/output/MordecaiA.out
diff --git a/Morphism/output/MordecaiB.out b/Morphism/output/MordecaiB.out
diff --git a/Morphism/output/MordredA.out b/Morphism/output/MordredA.out
diff --git a/Morphism/output/MordredB.out b/Morphism/output/MordredB.out
diff --git a/Morphism/output/MoriartyA.out b/Morphism/output/MoriartyA.out
diff --git a/Morphism/output/MoriartyB.out b/Morphism/output/MoriartyB.out
diff --git a/Morphism/output/MorpheusA.out b/Morphism/output/MorpheusA.out
diff --git a/Morphism/output/MorpheusB.out b/Morphism/output/MorpheusB.out
diff --git a/asalib/private/asalib.cpp b/asalib/private/asalib.cpp
@@ -5,4 +5,4 @@
 
 #include <asalib/public/library.h>
 
-asalib const char* AbelianSquaresAnalysis::BUILD = "1.3";
+asalib const char* AbelianSquaresAnalysis::BUILD = "1.3b";
diff --git a/asalib/private/morphism.cpp b/asalib/private/morphism.cpp
@@ -90,8 +90,8 @@ asalib morphismOutput AbelianSquaresAnalysis::morphism::RunMorphismSingle(morphi
 	bool k_uniform = true;
 	for (auto& morphismPair : input.morphism) {
 
-		// Check for prolongables
-		if (morphismPair.first.front() == morphismPair.second.front()) {
+		// Check for prolongables (sanitized to lower)
+		if (tolower(morphismPair.first.front()) == tolower(morphismPair.second.front())) {
 			output.morphismAnalysis.prolongable.push_back(morphismPair.first);
 		}
 

diff --git a/asalib/private/prefix.cpp b/asalib/private/prefix.cpp
@@ -80,7 +80,7 @@ prefix::substringAnalysisOutput asalib AbelianSquaresAnalysis::prefix::AnalyseSu
 
 	// Count second half
 	types::parihkVector secondHalf = input.alphabet; // copy construct
-	input.word.countOccurences(input.length / 2, std::string::npos, secondHalf);
+	input.word.countOccurences(input.length / 2, input.length / 2, secondHalf);
 
 	if (firstHalf == secondHalf) {
 		output.isSquare = true;
@@ -191,8 +191,9 @@ void asalib  AbelianSquaresAnalysis::prefix::SquaresCountTrivials(prefix::prefix
 		if (square.isTrivial) {
 			input.trivial++;
 		}
-		else {
+		/*else {
 			input.nontrivial++;
-		}
+		}*/
 	}
+	input.nontrivial = input.list.size() - input.trivial;
 }
diff --git a/asalib/private/word.cpp b/asalib/private/word.cpp
@@ -14,7 +14,7 @@ AbelianSquaresAnalysis::types::parihkVector::parihkVector()
 bool asalib AbelianSquaresAnalysis::types::parihkVector::isTrivial() const {
 	unsigned int count = 0;
 	for (const auto& entry : *this) {
-		if (entry.second == 0) count++;
+		if (entry.second != 0) count++;
 	}
 	return count == 1; // if a parihk vector of ([0,]*)^2 is tested, isTrivial returns false;
 }
@@ -38,15 +38,10 @@ AbelianSquaresAnalysis::types::parihkVector asalib AbelianSquaresAnalysis::types
 }
 
 void AbelianSquaresAnalysis::types::word::countOccurences(size_t offset, size_t count, AbelianSquaresAnalysis::types::parihkVector& out) {
-	std::string substr = this->substr(offset, count);
-	for (const auto& character : substr) {
-		types::parihkVector::iterator it = out.find(character);
-		if (it != out.end()) {
-			it->second++;
-		}
-		else {
-			throw new std::exception("Attempt to count occurences into ill-formed parihk vector!");
-		}
+	//std::string substr = this->substr(offset, count);
+	for (auto& alphabetCharacter : out) {
+		//alphabetCharacter.second = std::count(substr.begin(), substr.end(), alphabetCharacter.first);
+		alphabetCharacter.second = std::count(this->begin()+offset, this->begin()+offset+count, alphabetCharacter.first);
 	}
 }