--- trunk/src/UseTheForce/ForceField.cpp	2009/11/25 20:02:06	1390
+++ branches/development/src/UseTheForce/ForceField.cpp	2011/09/14 21:15:17	1629
@@ -51,15 +51,13 @@
 #include "UseTheForce/ForceField.hpp"
 #include "utils/simError.h"
 #include "utils/Tuple.hpp"
-#include "UseTheForce/DarkSide/atype_interface.h"
-#include "UseTheForce/DarkSide/fForceOptions_interface.h"
-#include "UseTheForce/DarkSide/switcheroo_interface.h"
 namespace OpenMD {
 
   ForceField::ForceField() { 
+
     char* tempPath; 
     tempPath = getenv("FORCE_PARAM_PATH");
-
+    
     if (tempPath == NULL) {
       //convert a macro from compiler to a string in c++
       STR_DEFINE(ffPath_, FRC_PATH );
@@ -68,16 +66,27 @@ namespace OpenMD {
     }
   }
 
-
-  ForceField::~ForceField() {
-    deleteAtypes();
-    deleteSwitch();
-  }
-
+  /**
+   * getAtomType by string
+   *
+   * finds the requested atom type in this force field using the string
+   * name of the atom type.
+   */
   AtomType* ForceField::getAtomType(const std::string &at) {
     std::vector<std::string> keys;
     keys.push_back(at);
     return atomTypeCont_.find(keys);
+  }
+
+  /**
+   * getAtomType by ident
+   *
+   * finds the requested atom type in this force field using the
+   * integer ident instead of the string name of the atom type.
+   */
+  AtomType* ForceField::getAtomType(int ident) {   
+    std::string at = atypeIdentToName.find(ident)->second;
+    return getAtomType(at);
   }
 
   BondType* ForceField::getBondType(const std::string &at1, 
@@ -439,6 +448,7 @@ namespace OpenMD {
   }
   
   NonBondedInteractionType* ForceField::getNonBondedInteractionType(const std::string &at1, const std::string &at2) {
+    
     std::vector<std::string> keys;
     keys.push_back(at1);
     keys.push_back(at2);    
@@ -448,9 +458,63 @@ namespace OpenMD {
     if (nbiType) {
       return nbiType;
     } else {
-      //if no exact match found, try wild card match
-      return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);
-    }    
+      AtomType* atype1;
+      AtomType* atype2;
+      std::vector<std::string> at1key;
+      at1key.push_back(at1);
+      atype1 = atomTypeCont_.find(at1key);
+      
+      std::vector<std::string> at2key;
+      at2key.push_back(at2);
+      atype2 = atomTypeCont_.find(at2key);
+      
+      // query atom types for their chains of responsibility
+      std::vector<AtomType*> at1Chain = atype1->allYourBase();
+      std::vector<AtomType*> at2Chain = atype2->allYourBase();
+      
+      std::vector<AtomType*>::iterator i;
+      std::vector<AtomType*>::iterator j;
+      
+      int ii = 0;
+      int jj = 0;
+      int nbiTypeScore;
+      
+      std::vector<std::pair<int, std::vector<std::string> > > foundNBI;
+      
+      for (i = at1Chain.begin(); i != at1Chain.end(); i++) {
+        jj = 0;
+        for (j = at2Chain.begin(); j != at2Chain.end(); j++) {
+          
+          nbiTypeScore = ii + jj;
+          
+          std::vector<std::string> myKeys;
+          myKeys.push_back((*i)->getName());
+          myKeys.push_back((*j)->getName());
+          
+          NonBondedInteractionType* nbiType = nonBondedInteractionTypeCont_.find(myKeys);
+          if (nbiType) {
+            foundNBI.push_back(std::make_pair(nbiTypeScore, myKeys));
+          }
+          jj++;
+        }
+        ii++;
+      }
+      
+      
+      if (foundNBI.size() > 0) {
+        // sort the foundNBI by the score:
+        std::sort(foundNBI.begin(), foundNBI.end());
+        
+        int bestScore = foundNBI[0].first;
+        std::vector<std::string> theKeys = foundNBI[0].second;
+        
+        NonBondedInteractionType* bestType = nonBondedInteractionTypeCont_.find(theKeys);        
+        return bestType;
+      } else {
+        //if no exact match found, try wild card match
+        return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);
+      }
+    }
   }
   
   BondType* ForceField::getExactBondType(const std::string &at1, 
@@ -506,12 +570,14 @@ namespace OpenMD {
   bool ForceField::addAtomType(const std::string &at, AtomType* atomType) {
     std::vector<std::string> keys;
     keys.push_back(at);
+    atypeIdentToName[atomType->getIdent()] = at;
     return atomTypeCont_.add(keys, atomType);
   }
 
   bool ForceField::replaceAtomType(const std::string &at, AtomType* atomType) {
     std::vector<std::string> keys;
     keys.push_back(at);
+    atypeIdentToName[atomType->getIdent()] = at;
     return atomTypeCont_.replace(keys, atomType);
   }
 
@@ -630,9 +696,4 @@ namespace OpenMD {
     return ffStream;
   }
 
-  void ForceField::setFortranForceOptions(){
-    ForceOptions theseFortranOptions;
-    forceFieldOptions_.makeFortranOptions(theseFortranOptions);
-    setfForceOptions(&theseFortranOptions);
-  }
 } //end namespace OpenMD