Bugfix: Coverage: fix display of ? and infinity when div by zero

Computing on TOTAL line: Linkable Residues Coverage Set totalLinkableResiduesCoverage to zero when totalLinkableResidues is zero. Computing: M+L+C Coverage If NumLinkableResidues is zero, show zero (Also update a .gitignore to exclude vs code .vscode dir)
yeastrc · Feb 20, 2020 · 765f623 · 765f623
1 parent c002e63
commit 765f623
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/proxl_web_app/front_end/.gitignore b/proxl_web_app/front_end/.gitignore
@@ -2,6 +2,7 @@
 /handlebars_templates_precompiled/
 /webpack_build_output/
 /.gradle/
+/.vscode/
 /.settings/
 .project
 VS_Code_Workspace.code-workspace

diff --git a/proxl_web_app/src/main/java/org/yeastrc/xlink/www/objects/ProteinCoverageData.java b/proxl_web_app/src/main/java/org/yeastrc/xlink/www/objects/ProteinCoverageData.java
@@ -32,7 +32,12 @@ public String getLinkableResiduesCoverageFmt() {
 
 
 	public String getMLCSequenceCoverage() {
-		return coverageFormat.format( (double)this.getNumMLCResidues() / (double)this.getNumLinkableResidues() );
+
+		double numMLCResidues_Div_NumLinkableResidues = 0;
+		if ( this.getNumLinkableResidues() != 0 ) {
+			numMLCResidues_Div_NumLinkableResidues = (double)this.getNumMLCResidues() / (double)this.getNumLinkableResidues();
+		}
+		return coverageFormat.format( numMLCResidues_Div_NumLinkableResidues );
 	}
 
 	public String getLCSequenceCoverage() {

diff --git a/..._web_app/src/main/java/org/yeastrc/xlink/www/protein_coverage/ProteinCoverageCompute.java b/..._web_app/src/main/java/org/yeastrc/xlink/www/protein_coverage/ProteinCoverageCompute.java
@@ -618,7 +618,7 @@ public int compare(ProteinCoverageData o1, ProteinCoverageData o2) {
 			pcd.setSequenceCoverage( sequenceCoverage );
 			pcd.setNumLinkableResidues( totalLinkableResidues );
 			double totalLinkableResiduesCoverage = 0;
-			if ( totalResidues != 0 ) {
+			if ( totalLinkableResidues != 0 ) {
 				totalLinkableResiduesCoverage = (double)totalLinkableResiduesCovered / (double)totalLinkableResidues;
 			}
 			pcd.setNumLinkableResiduesCovered( totalLinkableResiduesCovered );

diff --git a/...nd_coverage_pages/Protein_Coverage_SingleSearch_MultipleSearches_PageData_Webservice.java b/...nd_coverage_pages/Protein_Coverage_SingleSearch_MultipleSearches_PageData_Webservice.java
@@ -77,7 +77,7 @@ public class Protein_Coverage_SingleSearch_MultipleSearches_PageData_Webservice
 	 * 
 	 *  Increment this value whenever change the resulting image since Caching the resulting JSON
 	 */
-	static final int VERSION_FOR_CACHING = 1;
+	static final int VERSION_FOR_CACHING = 2;
 
 
 	@POST