X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FDirectedBinaryDomainCombination.java;h=10e47cdca1b08470126fdab88414cf3eaf1a0cbe;hb=3d5864a39739960c126f2ab5585162fd52d1f47d;hp=e57e137d780e7ec8a7e9474d39240e99e5a5baa8;hpb=e14e8c06907c1bb35de6c3c21986e1e32e520d82;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/DirectedBinaryDomainCombination.java b/forester/java/src/org/forester/surfacing/DirectedBinaryDomainCombination.java
index e57e137..10e47cd 100644
--- a/forester/java/src/org/forester/surfacing/DirectedBinaryDomainCombination.java
+++ b/forester/java/src/org/forester/surfacing/DirectedBinaryDomainCombination.java
@@ -22,30 +22,30 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.surfacing;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.forester.protein.BasicDomain;
 import org.forester.protein.BinaryDomainCombination;
-import org.forester.protein.DomainId;
 
 public class DirectedBinaryDomainCombination extends BasicBinaryDomainCombination {
 
-    public DirectedBinaryDomainCombination( final DomainId n_terminal, final DomainId c_terminal ) {
+    final private static Map<Integer, DirectedBinaryDomainCombination> DDC_POOL = new HashMap<Integer, DirectedBinaryDomainCombination>();
+
+    private DirectedBinaryDomainCombination( final String n_terminal, final String c_terminal ) {
         super();
         if ( ( n_terminal == null ) || ( c_terminal == null ) ) {
             throw new IllegalArgumentException( "attempt to create binary domain combination using null" );
         }
-        //_id_0 = n_terminal.getId();
-        //_id_1 = c_terminal.getId();
-        _data = n_terminal.getId() + BinaryDomainCombination.SEPARATOR + c_terminal.getId();
-    }
-
-    public DirectedBinaryDomainCombination( final String n_terminal, final String c_terminal ) {
-        this( new DomainId( n_terminal ), new DomainId( c_terminal ) );
+        _id0 = BasicDomain.obtainIdAsShort( n_terminal );
+        _id1 = BasicDomain.obtainIdAsShort( c_terminal );
     }
 
-    public static BinaryDomainCombination createInstance( final String ids ) {
+    public final static BinaryDomainCombination obtainInstance( final String ids ) {
         if ( ids.indexOf( BinaryDomainCombination.SEPARATOR ) < 1 ) {
             throw new IllegalArgumentException( "Unexpected format for binary domain combination [" + ids + "]" );
         }
@@ -53,6 +53,21 @@ public class DirectedBinaryDomainCombination extends BasicBinaryDomainCombinatio
         if ( ids_ary.length != 2 ) {
             throw new IllegalArgumentException( "Unexpected format for binary domain combination [" + ids + "]" );
         }
-        return new DirectedBinaryDomainCombination( ids_ary[ 0 ], ids_ary[ 1 ] );
+        return DirectedBinaryDomainCombination.obtainInstance( ids_ary[ 0 ], ids_ary[ 1 ] );
+    }
+
+    public final static DirectedBinaryDomainCombination obtainInstance( final String n_terminal, final String c_terminal ) {
+        final int code = calcCode( BasicDomain.obtainIdAsShort( n_terminal ), BasicDomain.obtainIdAsShort( c_terminal ) );
+        if ( DDC_POOL.containsKey( code ) ) {
+            return DDC_POOL.get( code );
+        }
+        else {
+            final DirectedBinaryDomainCombination dc = new DirectedBinaryDomainCombination( n_terminal, c_terminal );
+            DDC_POOL.put( code, dc );
+            if ( VERBOSE && ( ( DDC_POOL.size() % 100 ) == 0 ) ) {
+                System.out.println( " ddc pool size: " + DDC_POOL.size() );
+            }
+            return dc;
+        }
     }
 }