-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#ifndef SURF_NETWORK_CM02_HPP_
+#define SURF_NETWORK_CM02_HPP_
+
+#include <xbt/base.h>
+
#include "network_interface.hpp"
#include "xbt/fifo.h"
#include "xbt/graph.h"
-#ifndef SURF_NETWORK_CM02_HPP_
-#define SURF_NETWORK_CM02_HPP_
-
/***********
* Classes *
***********/
-class NetworkCm02Model;
-class NetworkCm02Action;
+class XBT_PRIVATE NetworkCm02Model;
+class XBT_PRIVATE NetworkCm02Action;
/*********
* Tools *
*********/
-void net_define_callbacks(void);
+XBT_PRIVATE void net_define_callbacks(void);
/*********
* Model *
private:
void initialize();
public:
- NetworkCm02Model(int /*i*/) : NetworkModel() {
- f_networkSolve = lmm_solve;
- m_haveGap = false;
- };//FIXME: add network clean interface
+ NetworkCm02Model(int /*i*/) : NetworkModel() {};
NetworkCm02Model();
~NetworkCm02Model() {
}
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
e_surf_link_sharing_policy_t policy,
- xbt_dict_t properties);
+ xbt_dict_t properties) override;
void addTraces();
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
public:
NetworkCm02Action(Model *model, double cost, bool failed)
- : NetworkAction(model, cost, failed) {};
+ : NetworkAction(model, cost, failed) {};
void updateRemainingLazy(double now);
};