From: Rene v. P. <ren...@gm...> - 2012-11-02 16:26:45
|
I already did a trial merge on a trunk I checked out, and that worked without a glitch On 2 November 2012 17:25, Richard Murray <mu...@cd...> wrote: > Hi Rene. Let me try to have a quick look at the branch today or tomorrow, > then I can send you a note and we can work on the merge. > > There have been some changes since 0.5c (we are now at 0.6a) that may make > the integration a little bit "interesting". The main one is the "timebase" > class variable 'dt', used to distinguish discrete and continuous time > systems. In addition, I have been doing small changes throughout to try to > make things more compatible with python 3. > > Also (for everyone on the list): I'm going to re-establish the > commit-hooks so that e-mail goes to this list when changes get committed to > the repository. > > I'll send you an e-mail after I have had a look. > > -richard > > On 2 Nov 2012, at 5:03 , Rene van Paassen <ren...@gm...> > wrote: > > > Hello, > > > > I think I have got a workable frequency response data object added. I > also added a test file in the tests directory. > > > > For now, the frequency vectors of different FRD objects need to match; > no interpolation / clipping yet. > > > > I also modified both StateSpace and TransferFunction to be combinable > with matrix-like objects in feedback, multiplication, etcetera, so now > something like > > > > sys.feedback([[0.1, 0.3],[0.0, 1.0]]) > > > > will work, given an 2 input 2 output system. > > > > Shall I merge into the trunk, or does anyone want to check first? The > frd branch (based on 0.5c) is located at > > > > svn+ssh://svn.code.sf.net/p/python-control/code/branches/add-frd > > > > -- > > René van Paassen | ______o____/_| Ren...@gm... > > <[___\_\_-----< t: +31 15 2628685 > > | o' mobile: +31 6 39846891 > > > > > > > ------------------------------------------------------------------------------ > > LogMeIn Central: Instant, anywhere, Remote PC access and management. > > Stay in control, update software, and manage PCs from one command center > > Diagnose problems and improve visibility into emerging IT issues > > Automate, monitor and manage. Do more in less time with Central > > > http://p.sf.net/sfu/logmein12331_d2d_______________________________________________ > > python-control-discuss mailing list > > pyt...@li... > > https://lists.sourceforge.net/lists/listinfo/python-control-discuss > > > > ------------------------------------------------------------------------------ > LogMeIn Central: Instant, anywhere, Remote PC access and management. > Stay in control, update software, and manage PCs from one command center > Diagnose problems and improve visibility into emerging IT issues > Automate, monitor and manage. Do more in less time with Central > http://p.sf.net/sfu/logmein12331_d2d > _______________________________________________ > python-control-discuss mailing list > pyt...@li... > https://lists.sourceforge.net/lists/listinfo/python-control-discuss > -- René van Paassen | ______o____/_| Ren...@gm... <[___\_\_-----< t: +31 15 2628685 | o' mobile: +31 6 39846891 |