Merge branch 'develop' of github.com:cyclus/cycamore into develop

cyclus · Nov 25, 2014 · 4fd4a34 · 4fd4a34
2 parents 1e22e82 + 25230cb
commit 4fd4a34
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/src/enrichment_facility.cc b/src/enrichment_facility.cc
@@ -69,7 +69,6 @@ void EnrichmentFacility::Tock() {
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 std::set<cyclus::RequestPortfolio<cyclus::Material>::Ptr>
 EnrichmentFacility::GetMatlRequests() {
-  using cyclus::CapacityConstraint;
   using cyclus::Material;
   using cyclus::RequestPortfolio;
   using cyclus::Request;
@@ -80,13 +79,9 @@ EnrichmentFacility::GetMatlRequests() {
   double amt = mat->quantity();
 
   if (amt > cyclus::eps()) {
-    CapacityConstraint<Material> cc(amt);
-    port->AddConstraint(cc);
-
     port->AddRequest(mat, this, in_commod);
-
     ports.insert(port);
-  }  // if amt > eps
+  }
 
   return ports;
 }

diff --git a/src/enrichment_facility_tests.cc b/src/enrichment_facility_tests.cc
@@ -297,9 +297,7 @@ TEST_F(EnrichmentFacilityTest, AddRequests) {
 
   const std::set< CapacityConstraint<Material> >& constraints =
       ports.begin()->get()->constraints();
-  CapacityConstraint<Material> c(inv_size);
-  EXPECT_EQ(constraints.size(), 1);
-  EXPECT_EQ(*constraints.begin(), c);
+  EXPECT_EQ(constraints.size(), 0);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

diff --git a/src/sink.cc b/src/sink.cc
@@ -59,7 +59,6 @@ std::string Sink::str() {
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 std::set<cyclus::RequestPortfolio<cyclus::Material>::Ptr>
 Sink::GetMatlRequests() {
-  using cyclus::CapacityConstraint;
   using cyclus::Material;
   using cyclus::RequestPortfolio;
   using cyclus::Request;
@@ -70,9 +69,6 @@ Sink::GetMatlRequests() {
   Material::Ptr mat = cyclus::NewBlankMaterial(amt);
 
   if (amt > cyclus::eps()) {
-    CapacityConstraint<Material> cc(amt);
-    port->AddConstraint(cc);
-
     std::vector<std::string>::const_iterator it;
     std::vector<Request<Material>*> mutuals;
     for (it = in_commods.begin(); it != in_commods.end(); ++it) {

diff --git a/src/sink_tests.cc b/src/sink_tests.cc
@@ -130,9 +130,7 @@ TEST_F(SinkTest, Requests) {
 
   const std::set< CapacityConstraint<Material> >& constraints =
       ports.begin()->get()->constraints();
-  ASSERT_TRUE(constraints.size() > 0);
-  EXPECT_EQ(constraints.size(), 1);
-  EXPECT_EQ(*constraints.begin(), CapacityConstraint<Material>(capacity_));
+  EXPECT_EQ(constraints.size(), 0);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -