changes from code review

nuclearkatie · Feb 26, 2024 · ac897e5 · ac897e5
1 parent 7e9944c
commit ac897e5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/src/material.cc b/src/material.cc
@@ -12,6 +12,8 @@ namespace cyclus {
 
 const ResourceType Material::kType = "Material";
 
+static int default_package_id_ = 1;
+
 Material::~Material() {}
 
 Material::Ptr Material::Create(Agent* creator, double quantity,
@@ -23,9 +25,7 @@ Material::Ptr Material::Create(Agent* creator, double quantity,
 
 Material::Ptr Material::CreateUntracked(double quantity,
                                         Composition::Ptr c) {
-  // default package id for untracked
-  int package_id = 1;
-  Material::Ptr m(new Material(NULL, quantity, c, package_id));
+  Material::Ptr m(new Material(NULL, quantity, c, default_package_id_));
   return m;
 }
 
@@ -90,9 +90,7 @@ Material::Ptr Material::ExtractComp(double qty, Composition::Ptr c,
   }
 
   qty_ -= qty;
-  // extracted material has default package
-  int package_id = 1;
-  Material::Ptr other(new Material(ctx_, qty, c, package_id));
+  Material::Ptr other(new Material(ctx_, qty, c, default_package_id_));
 
   // Decay called on the extracted material should have the same dt as for
   // this material regardless of composition.

diff --git a/src/material.h b/src/material.h
@@ -160,7 +160,7 @@ class Material: public Resource {
   virtual void ChangePackageId(int new_package_id);
 
  protected:
-  Material(Context* ctx, double quantity, Composition::Ptr c, int package_id);
+  Material(Context* ctx, double quantity, Composition::Ptr c, int package_id = 1);
 
  private:
   Context* ctx_;

diff --git a/src/product.cc b/src/product.cc
@@ -9,6 +9,7 @@ const ResourceType Product::kType = "Product";
 
 std::map<std::string, int> Product::qualids_;
 int Product::next_qualid_ = 1;
+static int default_package_id_ = 1;
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Product::Ptr Product::Create(Agent* creator, double quantity,
@@ -31,9 +32,7 @@ Product::Ptr Product::Create(Agent* creator, double quantity,
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Product::Ptr Product::CreateUntracked(double quantity,
                                       std::string quality) {
-  // default package id for untracked
-  int package_id = 1;
-  Product::Ptr r(new Product(NULL, quantity, quality, package_id));
+  Product::Ptr r(new Product(NULL, quantity, quality));
   r->tracker_.DontTrack();
   return r;
 }

diff --git a/src/product.h b/src/product.h
@@ -75,7 +75,7 @@ class Product : public Resource {
   /// @param ctx the simulation context
   /// @param quantity is a double indicating the quantity
   /// @param quality the resource quality
-  Product(Context* ctx, double quantity, std::string quality, int package_id);
+  Product(Context* ctx, double quantity, std::string quality, int package_id = 1);
 
   // map<quality, quality_id>
   static std::map<std::string, int> qualids_;

diff --git a/src/resource.h b/src/resource.h
@@ -5,8 +5,6 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 
-#include "package.h"
-
 class SimInitTest;
 
 namespace cyclus {