Merge pull request ash211#34 from pgaurav/master

fixed issue 17, please merge
Janderson3 · Jun 27, 2011 · 4886a32 · 4886a32
2 parents cf4e693 + 8d711d3
commit 4886a32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/gtfold-mfe/src/main.cc b/gtfold-mfe/src/main.cc
@@ -243,10 +243,13 @@ int main(int argc, char** argv) {
 
 	printf("Done.\n\n");
 	printf("Results:\n");
-	printf("- Minimum Free Energy: %12.4f kcal/mol\n", energy/100.00);
+	if (energy >= MAXENG)	
+		printf("- Minimum Free Energy: %12.4f kcal/mol\n", 0.00);
+	else
+		printf("- Minimum Free Energy: %12.4f kcal/mol\n", energy/100.00);
 	printf("- MFE runtime: %9.6f seconds\n", t1);
-	
-	
+
+
 	if (SUBOPT_ENABLED) {	
 		t1 = get_seconds();
 		ss_map_t subopt_data = subopt_traceback(seq.length(), 100.0*suboptDelta);
@@ -263,17 +266,15 @@ int main(int argc, char** argv) {
 	t1 = get_seconds();
 	trace(seq.length(), VERBOSE, UNAMODE, T_MISMATCH);
 	t1 = get_seconds() - t1;
-
+	
 	printf("\n");
 	print_sequence(seq.length());
 	print_structure(seq.length());
 	if (CONS_ENABLED)
 		print_constraints(seq.length());
 
-
 	if (SHAPE_ENABLED && VERBOSE)
 		print_shapeArray(seq.length());
-
 
 	save_ct_file(outputFile, seq, energy);
 	printf("\nMFE structure saved in .ct format to %s\n", outputFile.c_str());

diff --git a/gtfold-mfe/src/traceback.c b/gtfold-mfe/src/traceback.c
@@ -45,7 +45,7 @@ void trace(int len, int vv, int mode, int mismatch) {
 		structure[i] = 0;
 
 	if (W[len] >= MAXENG) {
-		printf("\n No Structure ");
+		printf("- No Structure \n");
 		return;
 	}