1
+
2
+
1
3
<!DOCTYPE html>
2
4
< html class ="writer-html5 " lang ="en " data-content_root ="../../../ ">
3
5
< head >
4
6
< meta charset ="utf-8 " />
5
7
< meta name ="viewport " content ="width=device-width, initial-scale=1.0 " />
6
- < title > diffpy.srmise.basefunction — diffpy.srmise 0.6.0 documentation</ title >
8
+ < title > diffpy.srmise.basefunction — diffpy.srmise 0.7.0rc0 documentation</ title >
7
9
< link rel ="stylesheet " type ="text/css " href ="../../../_static/pygments.css?v=fa44fd50 " />
8
- < link rel ="stylesheet " type ="text/css " href ="../../../_static/css/theme.css?v=19f00094 " />
10
+ < link rel ="stylesheet " type ="text/css " href ="../../../_static/css/theme.css?v=7ab3649f " />
9
11
10
12
11
- <!--[if lt IE 9]>
12
- <script src="../../../_static/js/html5shiv.min.js"></script>
13
- <![endif]-->
14
-
15
- < script src ="../../../_static/jquery.js?v=5d32c60e "> </ script >
16
- < script src ="../../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c "> </ script >
17
- < script src ="../../../_static/documentation_options.js?v=dda85ae5 "> </ script >
18
- < script src ="../../../_static/doctools.js?v=9a2dae69 "> </ script >
19
- < script src ="../../../_static/sphinx_highlight.js?v=dc90522c "> </ script >
13
+ < script src ="../../../_static/jquery.js?v=5d32c60e "> </ script >
14
+ < script src ="../../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c "> </ script >
15
+ < script src ="../../../_static/documentation_options.js?v=f0b64c81 "> </ script >
16
+ < script src ="../../../_static/doctools.js?v=9bcbadda "> </ script >
17
+ < script src ="../../../_static/sphinx_highlight.js?v=dc90522c "> </ script >
20
18
< script src ="../../../_static/js/theme.js "> </ script >
21
19
< link rel ="index " title ="Index " href ="../../../genindex.html " />
22
20
< link rel ="search " title ="Search " href ="../../../search.html " />
33
31
< a href ="../../../index.html " class ="icon icon-home ">
34
32
diffpy.srmise
35
33
</ a >
36
- < div class ="version ">
37
- 0.6.0
38
- </ div >
39
34
< div role ="search ">
40
35
< form id ="rtd-search-form " class ="wy-form " action ="../../../search.html " method ="get ">
41
36
< input type ="text " name ="q " placeholder ="Search docs " aria-label ="Search docs " />
@@ -181,6 +176,7 @@ <h1>Source code for diffpy.srmise.basefunction</h1><div class="highlight"><pre>
181
176
< span class ="sd "> The class (not instance) which implements caching of BaseFunction</ span >
182
177
< span class ="sd "> evaluations.</ span >
183
178
< span class ="sd "> """</ span >
179
+
184
180
< span class ="bp "> self</ span > < span class ="o "> .</ span > < span class ="n "> parameterdict</ span > < span class ="o "> =</ span > < span class ="n "> parameterdict</ span >
185
181
< span class ="bp "> self</ span > < span class ="o "> .</ span > < span class ="n "> npars</ span > < span class ="o "> =</ span > < span class ="nb "> len</ span > < span class ="p "> (</ span > < span class ="bp "> self</ span > < span class ="o "> .</ span > < span class ="n "> parameterdict</ span > < span class ="p "> )</ span >
186
182
@@ -195,9 +191,13 @@ <h1>Source code for diffpy.srmise.basefunction</h1><div class="highlight"><pre>
195
191
< span class ="k "> if</ span > < span class ="ow "> not</ span > < span class ="nb "> isinstance</ span > < span class ="p "> (</ span > < span class ="n "> p</ span > < span class ="p "> ,</ span > < span class ="nb "> str</ span > < span class ="p "> ):</ span >
196
192
< span class ="n "> emsg</ span > < span class ="o "> =</ span > < span class ="s2 "> "Argument parameterdict's keys must be strings."</ span >
197
193
< span class ="k "> raise</ span > < span class ="ne "> ValueError</ span > < span class ="p "> (</ span > < span class ="n "> emsg</ span > < span class ="p "> )</ span >
198
- < span class ="n "> vals</ span > < span class ="o "> =</ span > < span class ="bp "> self</ span > < span class ="o "> .</ span > < span class ="n "> parameterdict</ span > < span class ="o "> .</ span > < span class ="n "> values</ span > < span class ="p "> ()</ span >
194
+
195
+ < span class ="c1 "> # Convert values to list and sort</ span >
196
+ < span class ="n "> vals</ span > < span class ="o "> =</ span > < span class ="nb "> list</ span > < span class ="p "> (</ span > < span class ="bp "> self</ span > < span class ="o "> .</ span > < span class ="n "> parameterdict</ span > < span class ="o "> .</ span > < span class ="n "> values</ span > < span class ="p "> ())</ span >
199
197
< span class ="n "> vals</ span > < span class ="o "> .</ span > < span class ="n "> sort</ span > < span class ="p "> ()</ span >
200
- < span class ="k "> if</ span > < span class ="n "> vals</ span > < span class ="o "> !=</ span > < span class ="nb "> range</ span > < span class ="p "> (</ span > < span class ="bp "> self</ span > < span class ="o "> .</ span > < span class ="n "> npars</ span > < span class ="p "> ):</ span >
198
+
199
+ < span class ="c1 "> # Check if the sorted values match the sequence from 0 to npars-1</ span >
200
+ < span class ="k "> if</ span > < span class ="n "> vals</ span > < span class ="o "> !=</ span > < span class ="nb "> list</ span > < span class ="p "> (</ span > < span class ="nb "> range</ span > < span class ="p "> (</ span > < span class ="bp "> self</ span > < span class ="o "> .</ span > < span class ="n "> npars</ span > < span class ="p "> )):</ span >
201
201
< span class ="n "> emsg</ span > < span class ="o "> =</ span > < span class ="p "> (</ span >
202
202
< span class ="s2 "> "Argument parameterdict's values must uniquely specify "</ span >
203
203
< span class ="o "> +</ span > < span class ="s2 "> "the index of each parameter defined by its keys."</ span >
0 commit comments