Moved the explicit specializations of writeInGraph in Custom.cpp

Author: Iximiel

src/cltools/ShowGraph.cpp

@@ -338,7 +338,7 @@ int ShowGraph::main(FILE* in, FILE*out,Communicator& pc) {
     if( a->getName()=="DOMAIN_DECOMPOSITION" || a->getLabel()=="posx" || a->getLabel()=="posy" || a->getLabel()=="posz" || a->getLabel()=="Masses" || a->getLabel()=="Charges" ) {
       continue;
     }
-    ActionToPutData* ap=dynamic_cast<ActionToPutData*>(a);
+    ActionToPutData* ap=a->castToActionToPutData();
     if( ap ) {
       ofile.printf("%s(\"label=%s \n %s \n\")\n", getLabel(a).c_str(), getLabel(a,true).c_str(), a->writeInGraph().c_str() );
       continue;
@@ -347,12 +347,13 @@ int ShowGraph::main(FILE* in, FILE*out,Communicator& pc) {
     if( as ) {
       continue ;
     }
-    ActionWithValue* av=dynamic_cast<ActionWithValue*>(a);
-    ActionWithArguments* aaa=dynamic_cast<ActionWithArguments*>(a);
-    ActionAtomistic* at=dynamic_cast<ActionAtomistic*>(a);
+
     // Print out the connections between nodes
+    ActionAtomistic* at=a->castToActionAtomistic();
     printAtomConnections( at, linkcount, false, ofile );
+    ActionWithArguments* aaa=a->castToActionWithArguments();
     printArgumentConnections( aaa, linkcount, false, ofile );
+    ActionWithValue* av=a->castToActionWithValue();
     // Print out the nodes
     if( !av ) {
       ofile.printf("%s(\"label=%s \n %s \n\")\n", getLabel(a).c_str(), getLabel(a,true).c_str(), a->writeInGraph().c_str() );

src/function/Custom.cpp

@@ -475,6 +475,25 @@ Calculate an arbitrary function piecewise for one or multiple input matrices.
 */
 //+ENDPLUMEDOC
 
+template <>
+std::string FunctionOfScalar<Custom>::writeInGraph() const {
+  std::size_t und = getName().find_last_of("_");
+  std::cerr <<"FunctionOfScalar<Custom>::writeInGraph()\n";
+  return getName().substr(0,und) + "\nFUNC=" + myfunc.func;
+}
+
+template <>
+std::string FunctionOfVector<Custom>::writeInGraph() const {
+  std::size_t und = getName().find_last_of("_");
+  return getName().substr(0,und) + "\nFUNC=" + taskmanager.getActionInput().f.func;
+}
+
+template <>
+std::string FunctionOfMatrix<Custom>::writeInGraph() const {
+  std::size_t und = getName().find_last_of("_");
+  return getName().substr(0,und) + "\nFUNC=" + taskmanager.getActionInput().f.func;
+}
+
 typedef FunctionShortcut<Custom> CustomShortcut;
 PLUMED_REGISTER_ACTION(CustomShortcut,"CUSTOM")
 PLUMED_REGISTER_ACTION(CustomShortcut,"MATHEVAL")

src/function/FunctionOfMatrix.cpp

@@ -20,16 +20,3 @@
    along with plumed.  If not, see <http://www.gnu.org/licenses/>.
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
 #include "FunctionOfMatrix.h"
-#include "Custom.h"
-
-namespace PLMD {
-namespace function {
-
-template <>
-std::string FunctionOfMatrix<Custom>::writeInGraph() const {
-  std::size_t und = getName().find_last_of("_");
-  return getName().substr(0,und) + "\nFUNC=" + taskmanager.getActionInput().f.func;
-}
-
-}
-}

src/function/FunctionOfScalar.cpp

@@ -20,17 +20,3 @@
    along with plumed.  If not, see <http://www.gnu.org/licenses/>.
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
 #include "FunctionOfScalar.h"
-#include "Custom.h"
-
-namespace PLMD {
-namespace function {
-
-template <>
-std::string FunctionOfScalar<Custom>::writeInGraph() const {
-  std::size_t und = getName().find_last_of("_");
-  return getName().substr(0,und) + "\nFUNC=" + myfunc.func;
-}
-
-}
-}
-

src/function/FunctionOfVector.cpp

@@ -20,16 +20,3 @@
    along with plumed.  If not, see <http://www.gnu.org/licenses/>.
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
 #include "FunctionOfVector.h"
-#include "Custom.h"
-
-namespace PLMD {
-namespace function {
-
-template <>
-std::string FunctionOfVector<Custom>::writeInGraph() const {
-  std::size_t und = getName().find_last_of("_");
-  return getName().substr(0,und) + "\nFUNC=" + taskmanager.getActionInput().f.func;
-}
-
-}
-}