Changeset 104

Show
Ignore:
Timestamp:
03/08/09 16:44:05 (15 years ago)
Author:
bhilburn
Message:

Little reformatting regarding spacing and comments. Also, fixed parameter list
in components.h to properly use container struct types.

Location:
vtcross/branches/bhilburn/include
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • vtcross/branches/bhilburn/include/components.h

    r102 r104  
    55 */ 
    66 
    7  /* 
    8  * This header exports the declarations for all VT-CROSS radio components.  It 
     7 /* This header exports the declarations for all VT-CROSS radio components.  It 
    98 * contains two pure abstract base classes, Component and Engine; Engine derives 
    109 * from Component.  All functions contained within the abstract base classes are 
    11  * dynamically linked via the 'virtual' keyword, and all child non-abstract  
    12  * classes derive using private inheritence.  Class functions of the abstract 
    13  * base classes are public for two reasons: (1) To allow for public/protected 
    14  * inheritence in other implementations, (2) So that symbolic debuggers can 
    15  * navigate the call tree for typecasted objects of derivative classes. 
     10 * dynamically linked and pure, and all child non-abstract classes derive using  
     11 * private inheritence.  Class functions of the abstract base classes are public 
     12 * for two reasons: (1) To allow for public/protected inheritence in other  
     13 * implementations, (2) So that symbolic debuggers can navigate the call tree  
     14 * for typecasted objects of derivative classes. 
    1615 */ 
    1716 
     17 
    1818#include "containers.h" 
     19 
    1920 
    2021class Component 
    … …  
    6566        void ReceiveRadioConfiguration(); 
    6667        void ReceiveExperience(); 
    67         void GetSolution(observables); 
    68         void GetSolution(observables, service); 
    69         void ReceiveFeedback(observables, parameters, utilities); 
    70         void ReceiveFeedback(observables, parameters, service); 
     68        void GetSolution(Observable *observables); 
     69        void GetSolution(Observable *observables, string service); 
     70        void ReceiveFeedback(Observable *observables, Parameter *parameters, Utility *utilities); 
     71        void ReceiveFeedback(Observable *observables, Parameter *parameters, string service); 
    7172}; 
    7273 

  • vtcross/branches/bhilburn/include/containers.h

    r103 r104  
    33 * 
    44 * LICENSE INFORMATION GOES HERE 
    5  * 
    65 */ 
    76 
     7/* This header contains commonly used data container structs in VT-CROSS 
     8 * systems. 
     9 */ 
     10 
     11 
     12/* Until the new C++ i99 standard is made permanent, allow use of otherwise 
     13 * legacy C-libraries. 
     14 */ 
    815#ifdef GCC_EXPERIMENTAL 
    916    #include <cstdint> 
    … …  
    1219#endif 
    1320 
    14 using namespace std; 
    1521 
    1622struct CE_Info { 
    … …  
    2430 
    2531struct Utility { 
    26     string name; 
    27     string units; 
    28     string goal; 
     32    std::string name; 
     33    std::string units; 
     34    std::string goal; 
    2935    float target; 
    3036    float value; 
    … …  
    3339struct Affect { 
    3440    Utility *u; 
    35     string relation; 
     41    std::string relation; 
    3642}; 
    3743 
    3844struct Parameter { 
    39     string name; 
    40     string units; 
     45    std::string name; 
     46    std::string units; 
    4147    float min; 
    4248    uint32_t numAffects; 
    … …  
    4854 
    4955struct Observable { 
    50     string name; 
     56    std::string name; 
    5157    Affect affection_list[10]; 
    5258    uint32_t numAffects;