8000 added copyright info + small doc fix · MaxGaukler/python-control@20e384c · GitHub
[go: up one dir, main page]
Skip to content

Commit 20e384c

Browse files
murrayrmmurrayrm
committed
added copyright info + small doc fix
1 parent 8150fc5 commit 20e384c

File tree

1 file changed

+43
-45
lines changed

1 file changed

+43
-45
lines changed

‎src/timeresp.py

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,8 @@
1-
# timesim.py - time-domain simulation routes
2-
"""timesim.py
3-
1+
# timeresp.py - time-domain simulation routes
2+
"""
43
Time domain simulation.
54
65
This file contains a collection of functions that calculate time responses for linear systems.
7-
"""
8-
9-
"""Copyright (c) 2011 by California Institute of Technology
10-
All rights reserved.
11-
12-
Copyright (c) 2011 by Eike Welk
13-
Copyright (c) 2010 by SciPy Developers
14-
15-
Redistribution and use in source and binary forms, with or without
16-
modification, are permitted provided that the following conditions
17-
are met:
18-
19-
1. Redistributions of source code must retain the above copyright
20-
notice, this list of conditions and the following disclaimer.
21-
22-
2. Redistributions in binary form must reproduce the above copyright
23-
notice, this list of conditions and the following disclaimer in the
24-
documentation and/or other materials provided with the distribution.
25-
26-
3. Neither the name of the California Institute of Technology nor
27-
the names of its contributors may be used to endorse or promote
28-
products derived from this software without specific prior
29-
written permission.
30-
31-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
32-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
33-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
34-
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CALTECH
35-
OR THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
36-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
37-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
38-
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
39-
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
40-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
41-
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
42-
SUCH DAMAGE.
43-
44-
Author: Eike Welk
45-
Date: 12 May 2011
46-
$Id: matlab.py 157 2011-06-17 23:51:46Z murrayrm $
476
487
.. _time-series-convention:
498
@@ -113,7 +72,46 @@
11372
ft = D * U
11473
11574
----------------------------------------------------------------
75+
"""
76+
77+
"""Copyright (c) 2011 by California Institute of Technology
78+
All rights reserved.
79+
80+
Copyright (c) 2011 by Eike Welk
81+
Copyright (c) 2010 by SciPy Developers
82+
83+
Redistribution and use in source and binary forms, with or without
84+
modification, are permitted provided that the following conditions
85+
are met:
86+
87+
1. Redistributions of source code must retain the above copyright
88+
notice, this list of conditions and the following disclaimer.
89+
90+
2. Redistributions in binary form must reproduce the above copyright
91+
notice, this list of conditions and the following disclaimer in the
92+
documentation and/or other materials provided with the distribution.
93+
94+
3. Neither the name of the California Institute of Technology nor
95+
the names of its contributors may be used to endorse or promote
96+
products derived from this software without specific prior
97+
written permission.
11698
99+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
100+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
101+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
102+
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CALTECH
103+
OR THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
104+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
105+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
106+
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
107+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
108+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
109+
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
110+
SUCH DAMAGE.
111+
112+
Author: Eike Welk
113+
Date: 12 May 2011
114+
$Id: matlab.py 157 2011-06-17 23:51:46Z murrayrm $
117115
"""
118116

119117
# Libraries that we make use of
@@ -142,8 +140,8 @@ def _check_convert_array(in_obj, legal_shapes, err_msg_start, squeeze=False,
142140
143141
The function raises an exception when it detects an error.
144142
145-
Parameters:
146-
143+
Parameters
144+
----------
147145
in_obj: array like object
148146
The array or matrix which is checked.
149147

0 commit comments

Comments
 (0)
0