specialized extract for packaging

src/material.cc

@@ -140,15 +140,30 @@ void Material::Transmute(Composition::Ptr c) {
   }
 }
 
+Resource::Ptr Material::PackageExtract(double qty, std::string new_package_name) {
+  if (qty > qty_) {
+    throw ValueError("Attempted to extract more quantity than exists.");
+  }
+
+  qty_ -= qty;
+  Material::Ptr other(new Material(ctx_, qty, comp_, new_package_name));
+
+  // Decay called on the extracted material should have the same dt as for
+  // this material regardless of composition.
+  other->prev_decay_time_ = prev_decay_time_;
+
+  tracker_.Extract(&other->tracker_);
+  return boost::static_pointer_cast<Resource>(other);
+}
+
 void Material::ChangePackage(std::string new_package_name) {
-  if (new_package_name == package_name_ || ctx_ == NULL) {
+  if (ctx_ == NULL) {
     // no change needed
     return;
   }
   else if (new_package_name == Package::unpackaged_name()) {
     // unpackaged has functionally no restrictions
     package_name_ = new_package_name;
-    tracker_.Package();
     return;
   }
 
@@ -157,10 +172,10 @@ void Material::ChangePackage(std::string new_package_name) {
   double max = p->fill_max();
   if (qty_ >= min && qty_ <= max) {
     package_name_ = new_package_name;
-    tracker_.Package();
   } else {
     throw ValueError("Material quantity is outside of package fill limits.");
   }
+  tracker_.Package();
 }
 
 void Material::Decay(int curr_time) {

src/material.h

@@ -158,6 +158,9 @@ class Material: public Resource {
 
   virtual std::string package_name();
 
+  virtual Resource::Ptr PackageExtract(double qty,
+    std::string new_package_name = Package::unpackaged_name());
+
   /// Changes the package id. Checks that the resource fits the package 
   /// type minimum and maximum mass criteria.
   virtual void ChangePackage(std::string new_package_name = Package::unpackaged_name());

src/product.cc

@@ -76,6 +76,18 @@ std::string Product::package_name() {
   return package_name_;
 }
 
+Resource::Ptr Product::PackageExtract(double qty, std::string new_package_name) {
+  if (qty > quantity_) {
+    throw ValueError("Attempted to extract more quantity than exists.");
+  }
+
+  quantity_ -= qty;
+  Product::Ptr other(new Product(ctx_, qty, quality_, new_package_name));
+
+  tracker_.Extract(&other->tracker_);
+  return boost::static_pointer_cast<Resource>(other);
+}
+
 void Product::ChangePackage(std::string new_package_name) {
   if (new_package_name == package_name_ || ctx_ == NULL) {
     // no change needed

src/product.h

@@ -74,6 +74,8 @@ class Product : public Resource {
   /// Returns the package id.
   virtual std::string package_name();
 
+  virtual Resource::Ptr PackageExtract(double qty, std::string new_package_name = Package::unpackaged_name());
+
   /// Changes the product's package id
   virtual void ChangePackage(std::string new_package_name = Package::unpackaged_name());
 

src/res_tracker.cc

@@ -50,15 +50,11 @@ void ResTracker::Extract(ResTracker* removed) {
     parent2_ = 0;
 
     Record();
+  }
 
     removed->parent1_ = res_->state_id();
     removed->parent2_ = 0;
     removed->tracked_ = tracked_;
-  } else {
-    removed->parent1_ = parent1_;
-    removed->parent2_ = parent2_;
-    removed->tracked_ = tracked_;
-  }
 
   removed->Record();
 }
@@ -82,8 +78,7 @@ void ResTracker::Package() {
   Record();
 }
 
-void ResTracker::Record(bool no_bump) {
-  if (!no_bump) {
+void ResTracker::Record() {
   res_->BumpStateId();
   ctx_->NewDatum("Resources")
       ->AddVal("ResourceId", res_->state_id())
@@ -97,7 +92,6 @@ void ResTracker::Record(bool no_bump) {
       ->AddVal("Parent1", parent1_)
       ->AddVal("Parent2", parent2_)
       ->Record();
-  }
   res_->Record(ctx_);
 }
 

src/res_tracker.h

@@ -46,7 +46,7 @@ class ResTracker {
   void Package();
 
  private:
-  void Record(bool no_bump = false);
+  void Record();
 
   int parent1_;
   int parent2_;

src/resource.h

@@ -94,6 +94,8 @@ class Resource {
   /// Returns the package id.
   virtual std::string package_name() { return Package::unpackaged_name(); };
 
+  virtual Ptr PackageExtract(double qty, std::string new_package_name = Package::unpackaged_name()) = 0;
+
   /// Changes the product's package id
   virtual void ChangePackage(std::string new_package_name = Package::unpackaged_name()) {};
 
@@ -107,6 +109,12 @@ class Resource {
   static int nextstate_id_;
   static int nextobj_id_;
   int state_id_;
+  // Setting the state id should only be done when extracting one resource
+  void state_id(int st_id) {
+    state_id_ = st_id;
+  }
+
+
   int obj_id_;
 };
 
@@ -145,8 +153,7 @@ std::vector<typename T::Ptr> Resource::Package(Package::Ptr pkg) {
 
   while (quantity() > 0 && quantity() >= pkg->fill_min()) {
     double pkg_fill = std::min(quantity(), fill_mass);
-    t_pkgd = boost::dynamic_pointer_cast<T>(ExtractRes(pkg_fill));
-    t_pkgd->ChangePackage(pkg->name());
+    t_pkgd = boost::dynamic_pointer_cast<T>(PackageExtract(pkg_fill, pkg->name()));
     ts_pkgd.push_back(t_pkgd); 
   }
   return ts_pkgd;