Updated for Viginere and moving flag functions to new file

main.cpp

@@ -1,7 +1,7 @@
 //Ciphers/main.cpp
 //Matthew Ellison
 // Created: 4-25-18
-//Modified: 4-25-18
+//Modified: 4-29-18
 //This file contains the driver function and the test functions for the Cipher program
 //This program will use some simple ciphers that are no longer widely used but still fun to play with
 
@@ -9,6 +9,7 @@
 ///The header files
 #include "Headers/Caesar.hpp"
 #include "Headers/Playfair.hpp"
+#include "Headers/Vigenere.hpp"
 #include <iostream>
 #include <string>
 
@@ -19,6 +20,7 @@
 #ifdef TEST_VERSION
 #define CAESAR_TEST
 #define PLAYFAIR_TEST
+#define VIGENERE_TEST
 enum codingState { ENCODE, DECODE };
 std::string testingError(codingState type, const std::string& input, const std::string& output, const std::string& cipher);
 #endif //TEST_VERSION definition
@@ -31,6 +33,9 @@ bool caesarTest(std::string& errorString);
 bool playfairTest(std::string& errorString);
 #endif //PLAYFAIR_TEST
 
+#ifdef VIGENERE_TEST
+bool vigenereTest(std::string& errorString);
+#endif //VIGENERE_TEST
 
 
 //Main functions
@@ -69,6 +74,18 @@ int main(int argc, char** argv){
 	testResult = false;
 	#endif //PLAYFAIR_TEST
 
+	#ifdef VIGENERE_TEST
+	testResult = vigenereTest(errorString);
+	if(testResult){
+		resultString += "Vigenere Cipher completed successfully\n";
+	}
+	else{
+		resultString += "Vigenere Cipher error: " + errorString;
+	}
+	errorString = "";
+	testResult = false;
+	#endif //VIGENERE_TEST
+
 	std::cout << "Results:\n" << resultString << std::endl;
 	std::cin.get();
 
@@ -206,18 +223,140 @@ bool playfairTest(std::string& errorString){
 }
 #endif //PLAYFAIR_TEST
 
+#ifdef VIGENERE_TEST
+bool vigenereTest(std::string& errorString){
+	bool passed = true;
+	std::string keyword, inputString, outputString, cipherString;
+	Vigenere cipher;
+
+	//Test from wikipedia
+	keyword = "lemon";
+	inputString = "Attack at dawn";
+	outputString = "LXFOPVEFRNHR";
+	//Setup the cipher
+	cipherString = cipher.encode(keyword, inputString);
+	//If the cipher didn't spit out the correct string throw an error
+	if(cipherString != outputString){
+		errorString += testingError(ENCODE, inputString, outputString, cipherString);
+		passed = false;
+	}
+	//This removes the spaces and turns everything capital so the reverse will work correctly
+	inputString = cipher.getInputString();
+
+	//Do the same thing in reverse
+	cipher.reset();
+	cipherString = cipher.decode(keyword, outputString);
+	//If the cipher didn't spit out the correct string throw an error
+	if(cipherString != inputString){
+		errorString += testingError(DECODE, outputString, inputString, cipherString);
+		passed = false;
+	}
+
+
+	//Second test from wikipedia
+	keyword = "ABCD";
+	inputString = "CRYPTOISSHORTFORCRYPTOGRAPHY";
+	outputString = "CSASTPKVSIQUTGQUCSASTPIUAQJB";
+	//Setup the cipher
+	cipherString = cipher.encode(keyword, inputString);
+	//If the cipher didn't spit out the correct string throw an error
+	if(cipherString != outputString){
+		errorString += testingError(ENCODE, inputString, outputString, cipherString);
+		passed = false;
+	}
+	//This removes the spaces and turns everything capital so the reverse will work correctly
+	inputString = cipher.getInputString();
+
+	//Do the same thing in reverse
+	cipher.reset();
+	cipherString = cipher.decode(keyword, outputString);
+	//If the cipher didn't spit out the correct string throw an error
+	if(cipherString != inputString){
+		errorString += testingError(DECODE, outputString, inputString, cipherString);
+		passed = false;
+	}
+
+
+	//Return if the cipher passed the tests
+	return passed;
+}
+#endif //VIGENERE_TEST
 
 #else //TEST_VERSION main function
 
+#include "helperFunctions.hpp"
+#include <iostream>
+#include <string>
+#include <fstream>
 
-enum CipherFlagLocation { CAESAR, PLAYFAIR };
-void getFlags(bool flags[]);
 
 int main(int argc, char** argv){
-	//Add the ability to input and output files with the appropriate strings
-}
+	bool cipherFlags[SIZE];
+	std::string inputFileName, outputFileName, cipherString;
+	std::ifstream inputFile;
+	std::ofstream outputFile;
+	setFlagStrings();
 
-void getFlags(bool flags[]){
+	//Make sure the flags are all false by default
+	for(int cnt = 0;cnt < SIZE;++cnt){
+		cipherFlags[cnt] = false;
+	}
 
+	//Check what flags were set
+	getFlags(argc, argv, cipherFlags, inputFileName, outputFileName);
+	//Make sure that only one of the ciphers was selected
+	if(!checkFlags(cipherFlags)){
+		std::cout << "The flags given were invalid" << std::endl;
+		return 0;
+	}
+
+	//Check if output file can be opened
+	if(cipherFlags[OUTPUT_FILE]){
+		outputFile.open(outputFileName);
+		if(outputFile.fail()){
+			std::cout << "The output file could not be opened" << std::endl;
+			return 0;
+		}
+	}
+	//Check if input file can be opened
+	if(cipherFlags[INPUT_FILE]){
+		inputFile.open(inputFileName);
+		if(inputFile.fail()){
+			std::cout << "The input file could not be opened" << std::endl;
+			return 0;
+		}
+	}
+
+	//Run the appropriate functions for the cipher
+	if(cipherFlags[CAESAR]){
+		cipherString = runCaesar(inputFile, cipherFlags[ENCODE]);	
+	}
+	else if(cipherFlags[PLAYFAIR]){
+		cipherString = runPlayfair(inputFile, cipherFlags[ENCODE]);
+	}
+	else if(cipherFlags[VIGENERE]){
+		cipherString = runVigenere(inputFile, cipherFlags[ENCODE]);
+	}
+	else{
+		cipherString = "There is a big problem. No valid cipher option was given.\n";
+		return 0;
+	}
+
+	if(failFlag){
+		std::cout << cipherString << std::endl;
+		return 0;
+	}
+
+	//Decide where the cipher will be output
+	if(cipherFlags[OUTPUT_FILE]){
+		outputFile << cipherString << std::endl;
+	}
+	else{
+		std::cout << cipherString << std::endl;
+	}
+
+	inputFile.close();
+	outputFile.close();
+	return 0;
 }
 #endif //TEST_VERSION