#include "paper-column.hh"
#include "debug.hh"
#include "dimensions.hh"
-#include "single-malt-grouping-item.hh"
+#include "separation-item.hh"
Rod::Rod ()
item_l_drul_[LEFT] = item_l_drul_[RIGHT] =0;
}
-void
-Column_rod::print () const
-{
-#ifndef NDEBUG
- DEBUG_OUT << "Column_rod { rank = "
- << other_l_->rank_i () << ", dist = " << distance_f_ << "}\n";
-#endif
-}
Column_rod::Column_rod ()
{
return r1.other_l_->rank_i() - r2.other_l_->rank_i();
}
+
void
-Rod::add_to_cols ()
+Rod::columnize ()
{
Direction d = LEFT;
- Drul_array<Paper_column*> cols;
- Real extra_dist = 0.0;
do {
- cols[d] = item_l_drul_[d]->column_l ();
- extra_dist += item_l_drul_[d]->relative_coordinate (cols[d], X_AXIS);
+ Paper_column * pc = item_l_drul_[d]->column_l ();
+ distance_f_ += - d * item_l_drul_[d]->relative_coordinate (pc, X_AXIS);
+ item_l_drul_[d] = pc;
} while ((flip (&d))!=LEFT);
- if (cols[LEFT] != cols[RIGHT])
- do
- {
- cols[-d]->add_rod(cols[d], distance_f_ + extra_dist);
- }
- while ((flip (&d))!=LEFT);
+}
+
+void
+Rod::add_to_cols ()
+{
+ columnize();
+ if (item_l_drul_[LEFT] != item_l_drul_[RIGHT])
+ dynamic_cast<Paper_column*> (item_l_drul_[LEFT])->
+ add_rod(dynamic_cast<Paper_column*>(item_l_drul_[RIGHT]), distance_f_ );
}