Skip to content

Normas de Estilo AirController.cpp y AirController.h #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Normas de Estilo AirController.cpp y AirController.h #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4f1914
Cambios de estilo según cpplint en AirController.cpp
nevidal Dec 27, 2018
aea21e3
Cambios de estilo segun cpplint en AirController.h
nevidal Dec 27, 2018
864f2e5
Cambios de estilo según cpplint en Airport.h
nevidal Dec 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions src/simulator/AirController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,16 @@
#include <list>
#include <fstream>

namespace atcsim{
namespace atcsim {

AirController::AirController() {
// TODO Auto-generated constructor stub

// TODO(my_username): Auto-generated constructor stub
}

AirController::~AirController() {
// TODO Auto-generated destructor stub
// TODO(my_username): Auto-generated destructor stub
}

void
AirController::doWork()
{
AirController::doWork() {
std::list<Flight*> flights = Airport::getInstance()->getFlights();
std::list<Flight*>::iterator it;

Expand All @@ -62,16 +58,12 @@ AirController::doWork()
r3.pos = pos3;
r3.speed = 15.0;

for(it = flights.begin(); it!=flights.end(); ++it)
{
if((*it)->getRoute()->empty())
{
for(it = flights.begin(); it != flights.end(); ++it) {
if ((*it)->getRoute()->empty()) {
(*it)->getRoute()->push_back(r3);
(*it)->getRoute()->push_front(r2);
(*it)->getRoute()->push_front(r1);
(*it)->getRoute()->push_front(r0);
}
}
(*it)->getRoute()->push_front(r0);}
}
}

} // namespace atcsim
14 changes: 7 additions & 7 deletions src/simulator/AirController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
* along with ATCSim. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef AIRCONTROLLER_H_
#define AIRCONTROLLER_H_
#ifndef SRC_SIMULATOR_AIRCONTROLLER_H_
#define SRC_SIMULATOR_AIRCONTROLLER_H_

#include "Singleton.h"

namespace atcsim{

class AirController: public Singleton<AirController> {
public:
AirController();
virtual ~AirController();
public:
AirController();
virtual ~AirController();

void doWork();
void doWork();
};

}; // namespace atcsim

#endif /* AIRCONTROLLER_H_ */
#endif // SRC_SIMULATOR_AIRCONTROLLER_H_
Loading