Changeset 928f65

Timestamp:

May 18, 2016, 10:04:49 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

CombiningParticlePotentialParsing

Children:

52b5ca

Parents:

9bb977

git-author:

Frederik Heber <heber@…> (03/10/16 11:52:01)

git-committer:

Frederik Heber <heber@…> (05/18/16 22:04:49)

Message:

SavePotentialsAction writes both Particles and EmpiricalPotentials.

File:

• src/Actions/PotentialAction/SavePotentialsAction.cpp (modified) (3 diffs)

src/Actions/PotentialAction/SavePotentialsAction.cpp

@@ -50 +50 @@
 #include "Potentials/Exceptions.hpp"
 #include "Potentials/RegistrySerializer.hpp"
+#include "Potentials/Particles/Particle.hpp"
+#include "Potentials/Particles/ParticleRegistry.hpp"
 #include "Potentials/PotentialRegistry.hpp"
 
@@ -63 +65 @@
   // store the potentials
   if (!params.potential_file.get().string().empty()) {
-    // print fitted potentials
-    std::stringstream potentials;
-    RegistrySerializer<EmpiricalPotential> serialize(
-        potentials,
-        PotentialRegistry::getInstance(),
-        std::string("potential"));
-    serialize();
-    LOG(1, "STATUS: Resulting parameters are " << std::endl << potentials.str());
     std::ofstream returnstream(params.potential_file.get().string().c_str());
     if (returnstream.good()) {
+      // print particles
+      std::stringstream particles;
+      RegistrySerializer<Particle> serialize(
+          particles,
+          ParticleRegistry::getInstance(),
+          std::string("particle"));
+      serialize();
+      LOG(1, "STATUS: Resulting particles are " << std::endl << particles.str());
+      returnstream << particles.str();
+    } else {
+      STATUS("Could not open stream to write particles!");
+      return Action::failure;
+    }
+    if (returnstream.good()) {
+      // print fitted potentials
+      std::stringstream potentials;
+      RegistrySerializer<EmpiricalPotential> serialize(
+          potentials,
+          PotentialRegistry::getInstance(),
+          std::string("potential"));
+      serialize();
+      LOG(1, "STATUS: Resulting parameters are " << std::endl << potentials.str());
       returnstream << potentials.str();
     } else {
@@ -79 +95 @@
     }
   } else {
-    STATUS("No existing potential file given!");
+    STATUS("No usable potential filename given!");
     return Action::failure;
   }