From: Ryan K. <rk...@si...> - 2010-11-06 17:06:55
|
I guess I don't feel bad then. I have one project (rst2beamer) where I do everything in git, but the other developers use svn. So, I have two different directories, one for the svn version and one for the git version. I use unison to sync the two folders if I make a change in git or they make one in svn. This is a fairly ugly hack, but I haven't seen a better, more reliable solution. There are supposed to be built in svn capabilities in git, but I can't seem to make them work. -- Ryan Krauss, Ph.D. Assistant Professor Mechanical Engineering Southern Illinois University Edwardsville On Sat, Nov 6, 2010 at 11:44 AM, Richard Murray <mu...@cd...> wrote: > I *wish* I had something to make this easy. Since your code is nicely contained in a single file, I just grabbed the contents from github and replaced the body of the original file. Works fine in this case, but would not work if there were dozens of files in a package. > > -richard > > On 6 Nov 2010, at 9:41 , Ryan Krauss wrote: > >> Just for my information, what are you using to make git and svn play >> nice with one another. You seem to have made efficient work of >> pulling in my code from git. I know a little git and very little svn. >> >> -- >> Ryan Krauss, Ph.D. >> Assistant Professor >> Mechanical Engineering >> Southern Illinois University Edwardsville >> >> >> >> On Sat, Nov 6, 2010 at 10:25 AM, Richard Murray <mu...@cd...> wrote: >>> Thanks, Ryan. I'll pull the latest version of your package into the sourceforge repository (so that developers can access it quickly) and update the python-control step response to use your code. >>> >>> -richard >>> >>> On 6 Nov 2010, at 8:22 , Ryan Krauss wrote: >>> >>>> FYI, I saw some mention of lsim2 in a recent email. My code includes >>>> a step response function that first tries lsim then uses lsim2 if >>>> there is an exception. The exceptions usually are caused by pure >>>> integrators. I think that defaulting to lsim2 will make the >>>> simulation slower. >>>> >>>> I have fixed a few bugs in my code. There may even be a bug fix in >>>> the digital conversion code that hasn't made it into my main branch. >>>> The most recent versions of my code are on github and on my course >>>> website for this semester: >>>> >>>> https://github.com/ryanGT/controls >>>> http://www.cs.siue.edu/~rkrauss/mechatronics/2010/python_controls/python.html >>>> >>>> -- >>>> Ryan Krauss, Ph.D. >>>> Assistant Professor >>>> Mechanical Engineering >>>> Southern Illinois University Edwardsville >>>> >>>> >>>> >>>> On Sat, Nov 6, 2010 at 8:45 AM, Richard Murray <mu...@cd...> wrote: >>>>> A couple of updates on status of the the python-control package, related to the commit earlier today: >>>>> >>>>> * Ryan Krauss has sent me his control.py package that he uses for his class at Southern Illinois University Edwardsville. He has implemented functions for continuous to discrete time conversion and root locus plus. Ryan's code is now in trunk/external/control.py and Ryan has graciously given us permission to incorporate functions into the python-control package. >>>>> >>>>> * Roberto Bucher has sent me his yottalab.py package that has a number of functions for state space computations in continuous and discrete time. This code is in trunk/external/yottalab.py. Roberto has also give us permission to incoporate functions into the python-control library. >>>>> >>>>> * I've added a pade() command developed by Sawyer Fuller at Caltech, using the description in Golub and Van Loan. This code is in trunk/src/delay.py. >>>>> >>>>> * A group of students at Princeton (Lauren Padilla, Kevin Chen and Steve Brunton) are working on a class project this term and will be helping to implement some additional functions in the library. I've encouraged them to use this list to send out thoughts and ideas about their plans. >>>>> >>>>> * In integrating some of the functions from Ryan and Roberto, I've made various changes to things and fixed a couple of bugs. See trunk/ChangeLog for details. >>>>> >>>>> That's it for now. Comments and feedback is always welcome. >>>>> >>>>> -richard >>>>> >>>>> >>>>> >>>>> ------------------------------------------------------------------------------ >>>>> The Next 800 Companies to Lead America's Growth: New Video Whitepaper >>>>> David G. Thomson, author of the best-selling book "Blueprint to a >>>>> Billion" shares his insights and actions to help propel your >>>>> business during the next growth cycle. Listen Now! >>>>> http://p.sf.net/sfu/SAP-dev2dev >>>>> _______________________________________________ >>>>> python-control-discuss mailing list >>>>> pyt...@li... >>>>> https://lists.sourceforge.net/lists/listinfo/python-control-discuss >>>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> The Next 800 Companies to Lead America's Growth: New Video Whitepaper >>>> David G. Thomson, author of the best-selling book "Blueprint to a >>>> Billion" shares his insights and actions to help propel your >>>> business during the next growth cycle. Listen Now! >>>> http://p.sf.net/sfu/SAP-dev2dev >>>> _______________________________________________ >>>> python-control-discuss mailing list >>>> pyt...@li... >>>> https://lists.sourceforge.net/lists/listinfo/python-control-discuss >>> >>> >>> ------------------------------------------------------------------------------ >>> The Next 800 Companies to Lead America's Growth: New Video Whitepaper >>> David G. Thomson, author of the best-selling book "Blueprint to a >>> Billion" shares his insights and actions to help propel your >>> business during the next growth cycle. Listen Now! >>> http://p.sf.net/sfu/SAP-dev2dev >>> _______________________________________________ >>> python-control-discuss mailing list >>> pyt...@li... >>> https://lists.sourceforge.net/lists/listinfo/python-control-discuss >>> >> >> ------------------------------------------------------------------------------ >> The Next 800 Companies to Lead America's Growth: New Video Whitepaper >> David G. Thomson, author of the best-selling book "Blueprint to a >> Billion" shares his insights and actions to help propel your >> business during the next growth cycle. Listen Now! >> http://p.sf.net/sfu/SAP-dev2dev >> _______________________________________________ >> python-control-discuss mailing list >> pyt...@li... >> https://lists.sourceforge.net/lists/listinfo/python-control-discuss > > > ------------------------------------------------------------------------------ > The Next 800 Companies to Lead America's Growth: New Video Whitepaper > David G. Thomson, author of the best-selling book "Blueprint to a > Billion" shares his insights and actions to help propel your > business during the next growth cycle. Listen Now! > http://p.sf.net/sfu/SAP-dev2dev > _______________________________________________ > python-control-discuss mailing list > pyt...@li... > https://lists.sourceforge.net/lists/listinfo/python-control-discuss > |