From 40449a153932141571a98d33036372339a436af4 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 21 Aug 2018 22:11:18 -0700
Subject: [PATCH] Fixing #184

---
 .../src/main/java/eppic/model/dto/PdbInfo.java  | 17 +++++++++++++++++
 .../results/gui/panels/AssemblyInfoPanel.java   |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/eppic-model/src/main/java/eppic/model/dto/PdbInfo.java b/eppic-model/src/main/java/eppic/model/dto/PdbInfo.java
index bd33e773e..6695a2698 100644
--- a/eppic-model/src/main/java/eppic/model/dto/PdbInfo.java
+++ b/eppic-model/src/main/java/eppic/model/dto/PdbInfo.java
@@ -197,6 +197,23 @@ public List<Assembly> getAssemblies() {
 		return assemblies;
 	}
 
+	/**
+	 * Get the list of valid assemblies, i.e. those with id larger than 0.
+	 * Assemblies with id=0 represent the full unit cell, whilst assemblies with
+	 * id <0 represent topologically invalid assemblies (but annotated by PDB).
+	 * @return a list of topologically valid assemblies
+	 * @since 3.1.0
+	 */
+	public List<Assembly> getValidAssemblies() {
+		List<Assembly> validAssemblies = new ArrayList<Assembly>();
+		for (Assembly assembly : assemblies) {
+			if (assembly.getId()>0) {
+				validAssemblies.add(assembly);
+			}
+		}
+		return validAssemblies;
+	}
+
 	public void setAssemblies(List<Assembly> assemblies) {
 		this.assemblies = assemblies;
 	}
diff --git a/eppic-wui/src/main/java/ch/systemsx/sybit/crkwebui/client/results/gui/panels/AssemblyInfoPanel.java b/eppic-wui/src/main/java/ch/systemsx/sybit/crkwebui/client/results/gui/panels/AssemblyInfoPanel.java
index 6332a996d..ed3342798 100644
--- a/eppic-wui/src/main/java/ch/systemsx/sybit/crkwebui/client/results/gui/panels/AssemblyInfoPanel.java
+++ b/eppic-wui/src/main/java/ch/systemsx/sybit/crkwebui/client/results/gui/panels/AssemblyInfoPanel.java
@@ -38,7 +38,7 @@ public AssemblyInfoPanel(PdbInfo pdbInfo){
 		for(InterfaceCluster ic : clusters){
 			num_interfaces += ic.getInterfaces().size();
 		}
-    	assembly_info = new HTML("Number of assemblies: " + ApplicationContext.getPdbInfo().getAssemblies().size() + "<br>Number of interfaces: " + num_interfaces + "<br>Number of interface clusters: " + ApplicationContext.getPdbInfo().getInterfaceClusters().size());
+    	assembly_info = new HTML("Number of assemblies: " + ApplicationContext.getPdbInfo().getValidAssemblies().size() + "<br>Number of interfaces: " + num_interfaces + "<br>Number of interface clusters: " + ApplicationContext.getPdbInfo().getInterfaceClusters().size());
 
     	mainContainer.add(assembly_info);