/[ascend]/trunk/ascxx/incidencematrix.h
ViewVC logotype

Diff of /trunk/ascxx/incidencematrix.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2394 by jpye, Wed Dec 22 07:17:24 2010 UTC revision 2395 by jpye, Mon Feb 28 01:30:17 2011 UTC
# Line 6  Line 6 
6  #include "variable.h"  #include "variable.h"
7  #include "relation.h"  #include "relation.h"
8  #include "simulation.h"  #include "simulation.h"
9    #include "solverstatus.h"
10    
11  #include "config.h"  #include "config.h"
12    
# Line 17  typedef enum{ Line 18  typedef enum{
18      IM_NULL=0, IM_ACTIVE_FIXED, IM_ACTIVE_FREE, IM_DORMANT_FIXED, IM_DORMANT_FREE      IM_NULL=0, IM_ACTIVE_FIXED, IM_ACTIVE_FREE, IM_DORMANT_FIXED, IM_DORMANT_FREE
19  } IncidencePointType;  } IncidencePointType;
20    
21    typedef enum{
22        IM_CONVERGED=0, IM_OVER_ITER, IM_OVER_TIME, IM_DIVERGED, IM_NOT_YET_ATTEMPTED
23    } BlockStatusType;
24    
25  class IncidencePoint{  class IncidencePoint{
26  public:  public:
27      IncidencePoint(const int&row, const int&col, const IncidencePointType &type);      IncidencePoint(const int&row, const int&col, const IncidencePointType &type);
# Line 61  public: Line 66  public:
66      const std::vector<Variable> getBlockVars(const int &block);      const std::vector<Variable> getBlockVars(const int &block);
67      const std::vector<Relation> getBlockRels(const int &block);      const std::vector<Relation> getBlockRels(const int &block);
68      const std::vector<int> getBlockLocation(const int &block) const;      const std::vector<int> getBlockLocation(const int &block) const;
69        const BlockStatusType getBlockStatus(const int &block) const;
70      const int getNumBlocks();      const int getNumBlocks();
71  };  };
72    

Legend:
Removed from v.2394  
changed lines
  Added in v.2395

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22