[Dsim-svn] SF.net SVN: dsim:[35] trunk/dsim/dsim

[<qua...@us...>]

Revision: 35
          http://dsim.svn.sourceforge.net/dsim/?rev=35&view=rev
Author:   quannaus
Date:     2009-12-30 10:37:35 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
[Dev] Reordered some parts in the header files.

Modified Paths:
--------------
    trunk/dsim/dsim/DSIM_Service.hpp
    trunk/dsim/dsim/bom/ConfigurationParameters.hpp
    trunk/dsim/dsim/bom/RDSParameters.hpp
    trunk/dsim/dsim/service/DSIM_ServiceContext.hpp

Modified: trunk/dsim/dsim/DSIM_Service.hpp
===================================================================
--- trunk/dsim/dsim/DSIM_Service.hpp	2009-12-30 10:14:40 UTC (rev 34)
+++ trunk/dsim/dsim/DSIM_Service.hpp	2009-12-30 10:37:35 UTC (rev 35)
@@ -18,12 +18,12 @@
   
   /** Interface for the DSIM Services. */
   class DSIM_Service {
+  public:
+    // /////////// Business Methods /////////////
+    /** Perform a simulation. */
+    void simulate();
     
-  private:
-    // ///////// Service Context /////////
-    /** Dsim context. */
-    DSIM_ServiceContext* _dsimServiceContext;
-    
+
   public:
     // ////////// Constructors and destructors //////////
     /** Constructor.
@@ -47,10 +47,11 @@
     /** Finalise. */
     void finalise ();
 
-  public:
-    // /////////// Business Methods /////////////
-    /** Perform a simulation. */
-    void simulate();
+    
+  private:
+    // ///////// Service Context /////////
+    /** Dsim context. */
+    DSIM_ServiceContext* _dsimServiceContext;
 
   };
 }

Modified: trunk/dsim/dsim/bom/ConfigurationParameters.hpp
===================================================================
--- trunk/dsim/dsim/bom/ConfigurationParameters.hpp	2009-12-30 10:14:40 UTC (rev 34)
+++ trunk/dsim/dsim/bom/ConfigurationParameters.hpp	2009-12-30 10:37:35 UTC (rev 35)
@@ -11,10 +11,15 @@
 
   /** Structure wrapping the configuration parameters. */
   struct ConfigurationParameters : public StructAbstract {
-
   public:
-    // ///////// Attributes //////////
+    // //////// GETTERS /////////     
     
+    // //////// SETTERS /////////
+    
+    /////////// DISPLAY METHOD ///////////
+    const std::string describe() const;
+
+    
   public:
     /** Costructor. */
     ConfigurationParameters ();
@@ -23,15 +28,8 @@
     /** Destructor. */
     ~ConfigurationParameters ();
     
-    
   public:
-    // //////// GETTERS /////////     
-    
-    // //////// SETTERS /////////
-    
-    /////////// DISPLAY METHOD ///////////
-    const std::string describe() const;
-    
+    // ///////// Attributes //////////
   };
   
 }

Modified: trunk/dsim/dsim/bom/RDSParameters.hpp
===================================================================
--- trunk/dsim/dsim/bom/RDSParameters.hpp	2009-12-30 10:14:40 UTC (rev 34)
+++ trunk/dsim/dsim/bom/RDSParameters.hpp	2009-12-30 10:37:35 UTC (rev 35)
@@ -13,19 +13,6 @@
   struct RDSParameters : public StructAbstract {
     
   public:
-    // ////////// Attributes ///////////
-    /** Schedule input filename. */
-    std::string _scheduleInputFilename;
-
-  public:
-    /** Costructor. */
-    RDSParameters ();
-    RDSParameters (const RDSParameters&);
-
-    /** Destructor. */
-    ~RDSParameters ();
-
-  public:
     // //////// GETTERS /////////  
     /** Get the schedule input filename. */
     const std::string& getScheduleInputFilename () const {
@@ -41,6 +28,19 @@
     /////////// DISPLAY METHOD ///////////
     const std::string describe() const;
     
+
+  public:
+    /** Costructor. */
+    RDSParameters ();
+    RDSParameters (const RDSParameters&);
+
+    /** Destructor. */
+    ~RDSParameters ();
+
+  public:
+    // ////////// Attributes ///////////
+    /** Schedule input filename. */
+    std::string _scheduleInputFilename;
   };
   
 }

Modified: trunk/dsim/dsim/service/DSIM_ServiceContext.hpp
===================================================================
--- trunk/dsim/dsim/service/DSIM_ServiceContext.hpp	2009-12-30 10:14:40 UTC (rev 34)
+++ trunk/dsim/dsim/service/DSIM_ServiceContext.hpp	2009-12-30 10:37:35 UTC (rev 35)
@@ -28,33 +28,6 @@
   /** Class holding the context of the Dsim services. */
   class DSIM_ServiceContext : public ServiceAbstract {
     friend class FacDsimServiceContext;
-
-  private:
-    // ///////////// Children ////////////
-    /** CRS Service Handler. */
-    SIMCRS_ServicePtr_T _simcrsService;
-
-  private:
-    // //////////// Attributes //////////////////
-    /** Simulator ID. */
-    SimulatorID_T _simulatorID;
-
-    /** Configuration parameters. */
-    ConfigurationParameters _configurationParameters;
-    
-    /** Reference Data Set parameters. */
-    RDSParameters _rdsParameters;
-    
-  private:
-    // /////// Construction / initialisation ////////
-    /** Constructors. */
-    DSIM_ServiceContext ();
-    DSIM_ServiceContext (const SimulatorID_T&);
-    DSIM_ServiceContext (const DSIM_ServiceContext&);
-
-    /** Destructor. */
-    ~DSIM_ServiceContext();
-
   public:
     // ///////// Getters //////////
     /** Get the simulator ID. */
@@ -106,5 +79,31 @@
     const std::string display() const;
   };
 
+  private:
+    // /////// Construction / initialisation ////////
+    /** Constructors. */
+    DSIM_ServiceContext ();
+    DSIM_ServiceContext (const SimulatorID_T&);
+    DSIM_ServiceContext (const DSIM_ServiceContext&);
+
+    /** Destructor. */
+    ~DSIM_ServiceContext();
+
+  private:
+    // ///////////// Children ////////////
+    /** CRS Service Handler. */
+    SIMCRS_ServicePtr_T _simcrsService;
+
+  private:
+    // //////////// Attributes //////////////////
+    /** Simulator ID. */
+    SimulatorID_T _simulatorID;
+
+    /** Configuration parameters. */
+    ConfigurationParameters _configurationParameters;
+    
+    /** Reference Data Set parameters. */
+    RDSParameters _rdsParameters;
+
 }
 #endif // __DSIM_SVC_DSIMSERVICECONTEXT_HPP


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.