refac: removed unused JobOrders DescendingBoundedSlowdownOrder and DescendingSlowdownOrder

src/json_workload.hpp

@@ -116,7 +116,7 @@ private:
     int _job_number = 0;
 };
 
-struct Queue;
+class Queue;
 
 /**
  * Useful parsers

src/queue.cpp

@@ -24,16 +24,6 @@ SortableJobOrder::~SortableJobOrder()
 
 }
 
-void SortableJob::update_slowdown(Rational current_date)
-{
-    slowdown = current_date - release_date;
-}
-
-void SortableJob::update_bounded_slowdown(Rational current_date, Rational execution_time_lower_bound)
-{
-    bounded_slowdown = (current_date -  release_date) / execution_time_lower_bound;
-}
-
 
 FCFSOrder::~FCFSOrder()
 {
@@ -78,55 +68,6 @@ void LCFSOrder::updateJob(SortableJob *job, const SortableJobOrder::UpdateInform
     (void) info;
 }
 
-
-DescendingBoundedSlowdownOrder::DescendingBoundedSlowdownOrder(Rational min_job_length) :
-    _min_job_length(min_job_length)
-{
-
-}
-
-DescendingBoundedSlowdownOrder::~DescendingBoundedSlowdownOrder()
-{
-
-}
-
-bool DescendingBoundedSlowdownOrder::compare(const SortableJob *j1, const SortableJob *j2, const SortableJobOrder::CompareInformation *info) const
-{
-    (void) info;
-
-    if (j1->bounded_slowdown == j2->bounded_slowdown)
-        return jobcmp(j1->job, j2->job);
-    else
-        return j1->bounded_slowdown > j2->bounded_slowdown;
-}
-
-void DescendingBoundedSlowdownOrder::updateJob(SortableJob *job, const SortableJobOrder::UpdateInformation *info) const
-{
-    job->update_bounded_slowdown(info->current_date, _min_job_length);
-}
-
-
-DescendingSlowdownOrder::~DescendingSlowdownOrder()
-{
-
-}
-
-bool DescendingSlowdownOrder::compare(const SortableJob *j1, const SortableJob *j2, const SortableJobOrder::CompareInformation *info) const
-{
-    (void) info;
-
-    if (j1->slowdown == j2->slowdown)
-        return jobcmp(j1->job, j2->job);
-    else
-        return j1->slowdown > j2->slowdown;
-}
-
-void DescendingSlowdownOrder::updateJob(SortableJob *job, const SortableJobOrder::UpdateInformation *info) const
-{
-    job->update_slowdown(info->current_date);
-}
-
-
 AscendingSizeOrder::~AscendingSizeOrder()
 {
 
@@ -323,20 +264,6 @@ int Queue::nb_jobs() const
     return _jobs.size();
 }
 
-Rational Queue::compute_load_estimation() const
-{
-    Rational load = 0;
-
-    for (auto queue_it = _jobs.begin(); queue_it != _jobs.end(); ++queue_it)
-    {
-        const SortableJob * sjob = *queue_it;
-        const Job * job = sjob->job;
-
-        load += job->nb_requested_resources * job->walltime;
-    }
-
-    return load;
-}
 
 std::string Queue::to_string() const
 {

src/queue.hpp

@@ -10,11 +10,6 @@ struct SortableJob
 {
     const Job * job;
     Rational release_date;
-    Rational slowdown;
-    Rational bounded_slowdown;
-
-    void update_slowdown(Rational current_date);
-    void update_bounded_slowdown(Rational current_date, Rational execution_time_lower_bound);
 };
 
 class SortableJobOrder
@@ -58,26 +53,6 @@ public:
     void updateJob(SortableJob * job, const UpdateInformation * info = nullptr) const;
 };
 
-class DescendingBoundedSlowdownOrder : public SortableJobOrder
-{
-public:
-    DescendingBoundedSlowdownOrder(Rational min_job_length);
-    ~DescendingBoundedSlowdownOrder();
-    bool compare(const SortableJob * j1, const SortableJob * j2, const CompareInformation * info = nullptr) const;
-    void updateJob(SortableJob * job, const UpdateInformation * info = nullptr) const;
-
-private:
-    Rational _min_job_length;
-};
-
-class DescendingSlowdownOrder : public SortableJobOrder
-{
-public:
-    ~DescendingSlowdownOrder();
-    bool compare(const SortableJob * j1, const SortableJob * j2, const CompareInformation * info = nullptr) const;
-    void updateJob(SortableJob * job, const UpdateInformation * info = nullptr) const;
-};
-
 class AscendingSizeOrder : public SortableJobOrder
 {
 public:
@@ -128,7 +103,6 @@ public:
 
     bool is_empty() const;
     int nb_jobs() const;
-    Rational compute_load_estimation() const;
 
     std::string to_string() const;