/[ascend]/trunk/pygtk/interface/solver.i
ViewVC logotype

Diff of /trunk/pygtk/interface/solver.i

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

revision 227 by johnpye, Sat Jan 28 04:44:15 2006 UTC revision 233 by johnpye, Sun Jan 29 16:55:27 2006 UTC
# Line 25  public: Line 25  public:
25      void solve(Solver s);      void solve(Solver s);
26      SolverParameters getSolverParameters() const;      SolverParameters getSolverParameters() const;
27      void setSolverParameters(SolverParameters&);      void setSolverParameters(SolverParameters&);
28    
29        IncidenceMatrix getIncidenceMatrix();
30  };  };
31    
32  // SOLVE PARAMETERS  // SOLVE PARAMETERS
# Line 98  public: Line 100  public:
100      const std::string toString() const;      const std::string toString() const;
101  };  };
102    
103    /* Incidence matrix stuff */
104    typedef enum{
105        IM_NULL=0, IM_ACTIVE_FIXED, IM_ACTIVE_FREE, IM_DORMANT_FIXED, IM_DORMANT_FREE
106    } IncidencePointType;
107    
108    
109    class IncidencePoint{
110    public:
111        IncidencePoint(const IncidencePoint &);
112    
113        int row;
114        int col;
115        IncidencePointType type;
116    };
117    
118    %extend IncidencePoint{
119        %pythoncode{
120            def __repr__(self):
121                return str([ self.row, self.col, int(self.type) ]);
122        }
123    }
124    
125    %template(IncidencePointVector) std::vector<IncidencePoint>;
126    
127    class IncidenceMatrix{
128    public:
129        explicit IncidenceMatrix(Simulation &);
130        const std::vector<IncidencePoint> &getIncidenceData();
131    };

Legend:
Removed from v.227  
changed lines
  Added in v.233

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