display wastage

JamesBremner · Jun 30, 2020 · ae326e6 · ae326e6
1 parent 8c62101
commit ae326e6
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 13 deletions.
diff --git a/src/TimberAllocation.cpp b/src/TimberAllocation.cpp
@@ -45,6 +45,8 @@ int main( int argc, char* argv[] )
 
         // display depleted inventory
         std::cout << theInventory.textDetails();
+
+        DisplayWastage( levels );
     }
     catch( std::runtime_error& e )
     {

diff --git a/src/TimberAllocation.h b/src/TimberAllocation.h
@@ -151,6 +151,13 @@ class cLevel
 public:
     timberv_t myOrder;      // orders
     timber_t  myStock;      // stock allocated to level
+    int myAreaUsed;
+
+    cLevel()
+    : myAreaUsed( 0 )
+    {
+
+    }
     void removePacked();    // remove orders that have been packed
     std::string text() const;
     int height() const
@@ -161,6 +168,14 @@ class cLevel
     {
         return (int) myOrder.size();
     }
+    void use( timber_t order )
+    {
+        myAreaUsed += order->myLength * order->myWidth;
+    }
+    int wastage() const
+    {
+        return height() * ( myStock->myLength * myStock->myWidth - myAreaUsed );
+    }
 };
 
 class cInstance
@@ -265,16 +280,16 @@ bool CS2Pack2(
 
 /** Allocate an order
     @param[in] I the instance
-    @param[in] stock order is allocated to
-    @param[in] order being allocated
+    @param[in] level
+    @param[in] order index in level
     @param[[in] length position
     @param[[in] width position
     @param[[in] height position
 */
 void AllocateOrder(
     cInstance& I,
-    timber_t& stock,
-    timber_t& order,
+    cLevel& level,
+    int order,
     int length, int width, int height );
 
 /** Record the V cut for a level in the instance
@@ -288,4 +303,6 @@ void CutLevel(
 void ReturnToInventory(
     cInventory& I );
 
+void DisplayWastage( std::vector<cLevel>& levels );
+
 }
diff --git a/src/taCutter.cpp b/src/taCutter.cpp
@@ -283,9 +283,7 @@ bool CS2Pack2(
     for( pack2::item_t item : E.items() )
     {
         if( ! item->isPacked() )
-        {
             continue;
-        }
 
         packedCount++;
         if( packedCount == 1 )
@@ -302,8 +300,8 @@ bool CS2Pack2(
 
         AllocateOrder(
             I,
-            level.myStock,
-            level.myOrder[ atoi( item->userID().c_str() ) ],
+            level,
+            atoi( item->userID().c_str() ),
             item->locX(), item->locY(), h );
     }
 
@@ -360,13 +358,21 @@ bool CS2Pack2(
 
 void AllocateOrder(
     cInstance& I,
-    timber_t& stock,
-    timber_t& order,
+    cLevel& level,
+    int order,
     int length, int width, int height )
 {
-    order->pack( length, width, height, stock );
-    I.myAllocation.push_back( std::make_pair( order, stock ));
-    stock->used();
+    // allocate order to stock
+    level.myOrder[ order ]->pack( length, width, height, level.myStock );
+
+    // record allocation
+    I.myAllocation.push_back( std::make_pair( level.myOrder[ order ], level.myStock ));
+
+    // mark stock as used
+    level.myStock->used();
+
+    // record how much of level used
+    level.use( level.myOrder[ order ] );
 }
 void CutLevel(
     cInstance& I,
@@ -414,4 +420,11 @@ void ReturnToInventory(
         t->used( false );
     }
 }
+void DisplayWastage( std::vector<cLevel>& levels )
+{
+    int wastage = 0;
+    for( auto l : levels )
+        wastage += l.wastage();
+    std::cout << "w " << wastage << "\n";
+}
 }