Project

General

Profile

Revision ca164875

IDca164875fe61ab617869315f3bd89a98df15b04b

Added by Leon about 12 years ago

updating Order with util functs

View differences:

scout/libscout/src/behaviors/WH_Robot.cpp
49 49 

  		




  50
  50
  
    
void WH_Robot::set_task(Order order)


  		




  51
  51
  
    
{


  		




  52
  
  
    
    curr_task = new Order(order.getid(), order.get_source(), order.get_dest(), order.get_deadline(), order.get_start_time(), order.get_path(), order.get_est_time()); 


  		




  
  52
  
    
    curr_task = new Order(order.getid(), order.get_source(), order.get_dest(), 


  		




  
  53
  
    
        order.get_start_time(), order.get_path(), order.get_est_time()); 


  		




  53
  54
  
    
    return;


  		




  54
  55
  
    
}


  		




  55
  56
  
    

  		












  

    
      scout/libscout/src/helper_classes/Order.cpp
    
  





  3
  3
  
    
using namespace std;


  		




  4
  4
  
    

  		




  5
  5
  
    
/** @Brief: Regular order constructor */


  		




  6
  
  
    
Order::Order(int order_id, Address order_source, Address order_dest, Time order_deadline, Time order_start_time, Path order_path, Time order_est_time) 


  		




  
  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
  8
  
    
{ 


  		




  8
  9
  
    
    id = order_id;


  		




  9
  10
  
    
    source = order_source;


  		




  ......




  39
  40
  
    
    return path;


  		




  40
  41
  
    
}


  		




  41
  42
  
    

  		




  
  43
  
    
Time Order::get_est_time() const


  		




  
  44
  
    
{


  		




  
  45
  
    
    return est_time;


  		




  
  46
  
    
}


  		




  
  47
  
    

  		




  42
  48
  
    
bool Order::operator==(Order& o1, Order& o2)


  		




  43
  49
  
    
{


  		




  44
  50
  
    
  return o1.id == o2.id;


  		












  

    
      scout/libscout/src/helper_classes/Order.h
    
  





  14
  14
  
    
    Path path;


  		




  15
  15
  
    
    Time est_time;


  		




  16
  16
  
    
public:


  		




  17
  
  
    
    Order(int order_id, Address order_source, Address order_dest, Time order_deadline, Time order_start_time, Path order_path, Time order_est_time);


  		




  
  17
  
    
    Order(int order_id, Address order_source, Address order_dest, 


  		




  
  18
  
    
        Time order_start_time, Path order_path, Time order_est_time);


  		




  18
  19
  
    

  		




  19
  20
  
    
    int getid() const;


  		




  20
  21
  
    
    Address get_source() const;


  		




  21
  22
  
    
    Address get_dest() const;


  		




  22
  23
  
    
    Time get_start_time() const;


  		




  23
  24
  
    
    Path get_path() const;


  		




  
  25
  
    
    Time get_est_time() const;


  		




  24
  26
  
    
    void set_path(Path order_path);


  		




  25
  27
  
    

  		




  26
  28
  
    
    bool operator==(Order& o1, Order& o2);


  		












Also available in:  Unified diff