filtro quase

Signed-off-by: Egon Nathan Bittencourt Araujo <enba14@inf.ufpr.br>

playfair.cpp

@@ -22,7 +22,7 @@ std::vector< char > createKM ( const std::string key){
 				mask = mask | (_charbit('j') | _charbit('i'));
 			}
 
-			mKey[i*5 + j] = abc[si];
+			mKey[_pos(i,j)] = abc[si];
 		}
 	}
 	return mKey;
@@ -39,7 +39,6 @@ std::string playfair(std::string text, const std::string key, int crypt){
 		std::cout << std::endl;
 	}
 	unsigned int indexT = 0;
-	int repetitions=0;
 	while(indexT <text.size() ){
 		char fst = text[indexT];
 		char snd = (++indexT< text.size())?text[indexT]:'x';
@@ -51,7 +50,6 @@ std::string playfair(std::string text, const std::string key, int crypt){
 				snd='q';
 			}
 			--indexT;
-			++repetitions;
 		}
 
 		int iFst, iSnd;

playunfair.cpp

@@ -28,12 +28,24 @@ int main(int argc, char *argv[]){
 	while(std::getline(input, aux))
 		 text << aux;
 
+	//TODO: tirar caracteres especiais
 	std::cout<<text.str()[2] << std::endl;
 	crip = text.str();
 	parser(crip);
 	std::cout << crip << std::endl;
 	crip = playfair(crip, key, CRYPT);
 	std::cout << crip << std::endl;
+
+	//TODO: if ( 4 primeiras letras sem vogal ||
+	//           3 char -('o') iguais seguidos ||
+	//           5 consoantes ||
+	//           7 vogais ||
+	//           'q' + !'u' ||
+	//           ('c'|'d'|'f'|'h'|'k'|'p'|'q'|'w'|'y') + !(vogal|'r'|'h')
+	//
+	//          )
+	//         { elimina texto: muda pra proxima chave}
+
 	crip = playfair(crip, key, DECRYPT);
 	std::cout << crip << std::endl;
 	return 0;