/[ascend]/trunk/pygtk/simulation.h
ViewVC logotype

Diff of /trunk/pygtk/simulation.h

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

revision 771 by johnpye, Wed Jun 21 07:00:45 2006 UTC revision 772 by johnpye, Fri Jul 14 06:03:47 2006 UTC
# Line 8  Line 8 
8  #include "symchar.h"  #include "symchar.h"
9  #include "type.h"  #include "type.h"
10  #include "instance.h"  #include "instance.h"
11    #include "variable.h"
12  class Variable;  #include "relation.h"
13    
14  #include "config.h"  #include "config.h"
15  extern "C"{  extern "C"{
# Line 24  class IncidenceMatrix; Line 24  class IncidenceMatrix;
24  class SolverReporter;  class SolverReporter;
25    
26  /**  /**
27        A class to contain singularity information as returned by the DOF
28        function slvDOF_structsing.
29    */
30    class SingularityInfo{
31    public:
32        bool isSingular() const;
33        std::vector<Relation> rels; /**< relations involved in the singularity */
34        std::vector<Variable> vars; /**< variables involved in the singularity */
35        std::vector<Variable> freeablevars; /**< vars that should be freed */
36    };
37    
38    /**
39      @TODO This class is for *Simulation* instances.      @TODO This class is for *Simulation* instances.
40    
41      Handle instantiating, running initialisation functions, solving      Handle instantiating, running initialisation functions, solving
# Line 42  private: Line 54  private:
54      Instanc simroot;      Instanc simroot;
55      slv_system_structure *sys;      slv_system_structure *sys;
56      bool is_built;      bool is_built;
57        SingularityInfo *sing; /// will be used to store this iff singularity found
58    
59      // options to pass to BinTokenSetOptions      // options to pass to BinTokenSetOptions
60      /// TODO these should probably be put somewhere else      /// TODO these should probably be put somewhere else
# Line 88  public: Line 101  public:
101      const int getActiveBlock() const;      const int getActiveBlock() const;
102    
103      void checkConsistency() const;      void checkConsistency() const;
104      void checkStructuralSingularity() const;      bool checkStructuralSingularity();
105        const SingularityInfo &getSingularityInfo() const;
106  };  };
107    
108    

Legend:
Removed from v.771  
changed lines
  Added in v.772

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