X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FAdjactantDirectedBinaryDomainCombination.java;h=fabf40033fd54ad2f1ad56e81acb99137fd59213;hb=bf4f34e0511813622f68e54ffb783e4e6d92bfa4;hp=4675e17e2078dfadad8cc483884dd1e3f570aedd;hpb=757f42e63a33c5935b68af1d02a02c76d475fe79;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/AdjactantDirectedBinaryDomainCombination.java b/forester/java/src/org/forester/surfacing/AdjactantDirectedBinaryDomainCombination.java
index 4675e17..fabf400 100644
--- a/forester/java/src/org/forester/surfacing/AdjactantDirectedBinaryDomainCombination.java
+++ b/forester/java/src/org/forester/surfacing/AdjactantDirectedBinaryDomainCombination.java
@@ -22,26 +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;
+
 public class AdjactantDirectedBinaryDomainCombination extends BasicBinaryDomainCombination {
 
-    public AdjactantDirectedBinaryDomainCombination( final DomainId n_terminal, final DomainId c_terminal ) {
+    final private static Map<Integer, AdjactantDirectedBinaryDomainCombination> ADDC_POOL = new HashMap<Integer, AdjactantDirectedBinaryDomainCombination>();
+
+    private AdjactantDirectedBinaryDomainCombination( 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();
-    }
-
-    public AdjactantDirectedBinaryDomainCombination( 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 AdjactantDirectedBinaryDomainCombination createInstance( final String ids ) {
+    public final static AdjactantDirectedBinaryDomainCombination obtainInstance( final String ids ) {
         if ( ids.indexOf( BinaryDomainCombination.SEPARATOR ) < 1 ) {
             throw new IllegalArgumentException( "Unexpected format for binary domain combination [" + ids + "]" );
         }
@@ -49,6 +53,23 @@ public class AdjactantDirectedBinaryDomainCombination extends BasicBinaryDomainC
         if ( ids_ary.length != 2 ) {
             throw new IllegalArgumentException( "Unexpected format for binary domain combination [" + ids + "]" );
         }
-        return new AdjactantDirectedBinaryDomainCombination( ids_ary[ 0 ], ids_ary[ 1 ] );
+        return AdjactantDirectedBinaryDomainCombination.obtainInstance( ids_ary[ 0 ], ids_ary[ 1 ] );
+    }
+
+    public final static AdjactantDirectedBinaryDomainCombination obtainInstance( final String n_terminal,
+                                                                                 final String c_terminal ) {
+        final int code = calcCode( BasicDomain.obtainIdAsShort( n_terminal ), BasicDomain.obtainIdAsShort( c_terminal ) );
+        if ( ADDC_POOL.containsKey( code ) ) {
+            return ADDC_POOL.get( code );
+        }
+        else {
+            final AdjactantDirectedBinaryDomainCombination dc = new AdjactantDirectedBinaryDomainCombination( n_terminal,
+                                                                                                              c_terminal );
+            ADDC_POOL.put( code, dc );
+            if ( VERBOSE && ( ADDC_POOL.size() % 100 == 0 ) ) {
+                System.out.println( " addc pool size: " + ADDC_POOL.size() );
+            }
+            return dc;
+        }
     }
 }