Project

General

Profile

Revision 2f025967

ID2f0259679a0994dd9893ecace84dab0fa118eaeb

Added by Priya about 12 years ago

Got scheduler to compile. onto wh robots

View differences:

scout/libscout/src/helper_classes/Order.cpp
4 4

  
5 5
/** @Brief: Regular order constructor */
6 6
Order::Order(int order_id, Address order_source, Address order_dest, 
7
    Time order_start_time, Path order_path, Time order_est_time) 
7
    Time order_start_time, Path order_path, Duration order_est_time) 
8 8
{ 
9 9
    id = order_id;
10 10
    source = order_source;
......
40 40
    return path;
41 41
}
42 42

  
43
Time Order::get_est_time() const
43
Duration Order::get_est_time() const
44 44
{
45 45
    return est_time;
46 46
}
47 47

  
48
bool Order::operator==(Order& o1, Order& o2)
48
bool Order::operator==(Order& order)
49 49
{
50
  return o1.id == o2.id;
50
  return this->id == order.id;
51 51
}
52 52

  
53 53
void Order::set_path(Path order_path)

Also available in: Unified diff