Context Navigation

-              rb5ebb5
+              rb05673
  */
 FragmentJob::FragmentJob() :
   outputfile(""),
   JobId(-1)
+  JobId(-1),
+  outputfile("")
 {}
 …
  */
 FragmentJob::FragmentJob(const std::string &_outputfile, const JobId_t _JobId) :
   outputfile(_outputfile),
   JobId(_JobId)
+  JobId(_JobId),
+  outputfile(_outputfile)
 {}
 …
 bool FragmentJob::operator==(const FragmentJob &other) const
+{
   return (outputfile == other.outputfile) && (JobId == JobId);
+  return (outputfile == other.outputfile) && (getId() == other.getId());
+}
-const JobId_t FragmentJob::getId() const
+{
-  return JobId;
+}

src/Fragmentation/Automation/FragmentJob.hpp

-              rb5ebb5
+              rb05673
 #include <string>
 #include "boost/serialization/access.hpp"
+#include "boost/serialization/array.hpp"
+#include "JobId.hpp"
 #include "types.hpp"
 …
  * transfered to a scheduler (server) and be deserialized by the Worker.
  */
 class FragmentJob
+class FragmentJob : public JobId
+{
   friend class FragmentWorker;
 …
+  }
+  const JobId_t getId() const;
+  //!> string containing the configuration file for the solver
+  std::string outputfile;
 private:
 …
   void serialize(Archive& ar, const unsigned int version)
+  {
+    ar & boost::serialization::base_object<JobId>(*this);
     ar & outputfile;
-    ar & JobId;
+  }
-private:
-  //!> string containing the configuration file for the solver
-  std::string outputfile;
-  //!> unique id of this job (used for the temporary filename) and associating result
-  JobId_t JobId;
 };

-              rb5ebb5
+              rb05673
+{
   /// check for presence
   ResultMap::iterator iter = results.find(jobid);
+  ResultMap::iterator iter = results.find(result.getId());
   ASSERT(iter != results.end(),
       "FragmentQueue::pushResult() - job "+toString(jobid)+" is not known to us.");
+      "FragmentQueue::pushResult() - job "+toString(result.getId())+" is not known to us.");
   ASSERT(iter->second == NoResult,
       "FragmentQueue::pushResult() - is not waiting for the result of job "+toString(jobid)+".");
+      "FragmentQueue::pushResult() - is not waiting for the result of job "+toString(result.getId())+".");
   /// and overwrite NoResult in found entry
   iter->second = result;

-              rb5ebb5
+              rb05673
 /** Constructor of class FragmentResult.
+ *
  * \param id id of FragmntJob associated to this FragmentResult.
+ * \param _id id of FragmntJob associated to this FragmentResult.
  */
 FragmentResult::FragmentResult(const JobId_t _id) :
   id(_id),
+  JobId(_id),
   result(std::string("Nothing"))
 {}
 …
  */
 FragmentResult::FragmentResult(const FragmentResult &other) :
   id(other.id),
+  JobId(other.getId()),
   result(other.result)
 {}
 …
 {}
 /** Equality operator: Equal if both ids are the same
+/** Equality operator: Equal if both JobIds are the same
+ *
  * \param other instance to check against
  * \return true - both ids are the same, false - ids are not the same.
+ * \return true - both JobIds are the same, false - JobIds are not the same.
  */
 bool FragmentResult::operator==(const FragmentResult &other) const
+{
   return id == other.id;
+  return getId() == other.getId();
+}
 /** Assigment operator.
+ *
  * \note We can't use default assigment because of const member FragmentResult::id.
+ * \note We can't use default assigment because of const member FragmentResult::JobId.
+ *
  * \param other instance to make equal to
 …
   /// check self-assignment
   if (this != &other) {
     const_cast<JobId_t &>(id) = other.id;
+    setId(other.getId());
     result = other.result;
+  }

-              rb5ebb5
+              rb05673
 #include <string>
+#include "boost/serialization/array.hpp"
+#include "JobId.hpp"
 #include "types.hpp"
 …
+ *
  */
 class FragmentResult
+class FragmentResult : public JobId
+{
 public:
 …
     { return !(*this == other); }
-  //!> this job's unique id
-  const JobId_t id;
   //!> result
   std::string result;
+private:
+  friend class boost::serialization::access;
+  // serialization
+  template <typename Archive>
+  void serialize(Archive& ar, const unsigned int version)
+  {
+    ar & boost::serialization::base_object<JobId>(*this);
+    ar & result;
+  }
 };

rb5ebb5	rb05673
88	88	void FragmentWorker::handle_read(const boost::system::error_code& e)
89	89	{
90		Info info(__FUNCTION__);
	90	Info info(__FUNCTION__);
91	91	if (!e)
92	92	{
…	…
96	96	std::cout << "Job number " << i << "\n";
97	97	std::cout << " output: " << jobs_[i].outputfile << "\n";
98		std::cout << " id: " << jobs_[i].~~JobId~~ << "\n";
	98	std::cout << " id: " << jobs_[i].getId() << "\n";
99	99	}
100	100	}

-              rb5ebb5
+              rb05673
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
-INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements -I$(top_srcdir)/LinearAlgebra/src
 bin_PROGRAMS += Server Worker
 Server_SOURCES = \
+SERVERSOURCE = \
   atexit.cpp \
+  FragmentJob.cpp \
+  FragmentScheduler.cpp \
+  JobId.cpp \
+  Server.cpp
+SERVERHEADER = \
   atexit.hpp \
   Connection.hpp \
+  FragmentJob.hpp \
+  FragmentScheduler.hpp \
+  JobId.hpp
+WORKERSOURCE = \
+  atexit.cpp \
   FragmentJob.cpp \
+  FragmentWorker.cpp \
+  JobId.cpp \
+  Worker.cpp
+WORKERHEADER = \
+  atexit.hpp \
+  Connection.hpp \
   FragmentJob.hpp \
+  FragmentScheduler.cpp \
+  FragmentScheduler.hpp \
+  Server.cpp
+  FragmentWorker.hpp \
+  JobId.hpp
+Server_SOURCES = $(SERVERSOURCE) $(SERVERHEADER)
 Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
 Server_CXXFLAGS = $(AM_CPPFLAGS)
 …
   ${CodePatterns_LIBS}
+Worker_SOURCES = \
+  atexit.cpp \
+  atexit.hpp \
+  Connection.hpp \
+  FragmentJob.cpp \
+  FragmentJob.hpp \
+  FragmentWorker.cpp \
+  FragmentWorker.hpp \
+  Worker.cpp
+Worker_SOURCES = $(WORKERSOURCE) $(WORKERHEADER)
 Worker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
 Worker_CXXFLAGS = $(AM_CPPFLAGS)

-              rb5ebb5
+              rb05673
 FRAGMENTATIONAUTOMATIONLIBS = \
+  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) \
   ${CodePatterns_LIBS}
 …
   FragmentQueue.hpp \
   FragmentResult.cpp \
+  FragmentResult.hpp
+  FragmentResult.hpp \
+  JobId.cpp \
+  JobId.hpp
 FragmentQueueUnitTest_LDADD = $(FRAGMENTATIONAUTOMATIONLIBS)

Note: See TracChangeset for help on using the changeset viewer.