Skip to content

Commit 454e5a9

Browse files
committed
Updated installation instructions
1 parent a902648 commit 454e5a9

File tree

14 files changed

+101
-85
lines changed

14 files changed

+101
-85
lines changed

README.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ Additionally, the following python packages should be installed (these will be i
4646
* NumPy 1.11 or higher (http://www.numpy.org/)
4747
* SciPy 0.18 or higher (http://www.scipy.org/)
4848
* Pandas 0.17 or higher (http://pandas.pydata.org/)
49+
* trustregion 1.1 or higher (https://github.com/lindonroberts/trust-region)
50+
51+
**Warning:** the trustregion package requires NumPy to already be installed. Please install NumPy before following the installation instructions below. This applies to DFO-LS versions 1.2 and higher.
4952

5053
Installation using pip
5154
----------------------
-1.16 KB
Binary file not shown.
1.21 KB
Binary file not shown.

docs/build/html/_sources/install.rst.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ Additionally, the following python packages should be installed (these will be i
1313
* NumPy 1.11 or higher (http://www.numpy.org/)
1414
* SciPy 0.18 or higher (http://www.scipy.org/)
1515
* Pandas 0.17 or higher (http://pandas.pydata.org/)
16+
* trustregion 1.1 or higher (https://github.com/lindonroberts/trust-region)
17+
18+
**Warning:** the trustregion package requires NumPy to already be installed. Please install NumPy before following the installation instructions below. This applies to DFO-LS versions 1.2 and higher.
1619

1720
Installation using pip
1821
----------------------

docs/build/html/install.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@ <h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to t
178178
<li><p>NumPy 1.11 or higher (<a class="reference external" href="http://www.numpy.org/">http://www.numpy.org/</a>)</p></li>
179179
<li><p>SciPy 0.18 or higher (<a class="reference external" href="http://www.scipy.org/">http://www.scipy.org/</a>)</p></li>
180180
<li><p>Pandas 0.17 or higher (<a class="reference external" href="http://pandas.pydata.org/">http://pandas.pydata.org/</a>)</p></li>
181+
<li><p>trustregion 1.1 or higher (<a class="reference external" href="https://github.com/lindonroberts/trust-region">https://github.com/lindonroberts/trust-region</a>)</p></li>
181182
</ul>
183+
<p><strong>Warning:</strong> the trustregion package requires NumPy to already be installed. Please install NumPy before following the installation instructions below. This applies to DFO-LS versions 1.2 and higher.</p>
182184
</div>
183185
<div class="section" id="installation-using-pip">
184186
<h2>Installation using pip<a class="headerlink" href="#installation-using-pip" title="Permalink to this headline"></a></h2>

docs/build/html/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/build/latex/DFOLS.fdb_latexmk

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Fdb version 3
2-
["makeindex DFOLS.idx"] 1533896586 "DFOLS.idx" "DFOLS.ind" "DFOLS" 1581508570
3-
"DFOLS.idx" 1581508569 0 d41d8cd98f00b204e9800998ecf8427e ""
2+
["makeindex DFOLS.idx"] 1533896586 "DFOLS.idx" "DFOLS.ind" "DFOLS" 1581509750
3+
"DFOLS.idx" 1581509750 0 d41d8cd98f00b204e9800998ecf8427e ""
44
(generated)
55
"DFOLS.ilg"
66
"DFOLS.ind"
7-
["pdflatex"] 1581508569 "DFOLS.tex" "DFOLS.pdf" "DFOLS" 1581508570
7+
["pdflatex"] 1581509749 "DFOLS.tex" "DFOLS.pdf" "DFOLS" 1581509750
88
"/etc/texmf/web2c/texmf.cnf" 1556127073 1101 af7716885e081ab43982cab7b4672c1a ""
99
"/usr/share/texlive/texmf-dist/fonts/enc/dvips/base/8r.enc" 1165713224 4850 80dc9bab7f31fb78a000ccfed0e27cab ""
1010
"/usr/share/texlive/texmf-dist/fonts/map/fontname/texfonts.map" 1272929888 3287 e6b82fe08f5336d4d5ebc73fb1152e87 ""
@@ -165,22 +165,22 @@
165165
"/usr/share/texmf/web2c/texmf.cnf" 1503343927 31343 93828589fb0cea665e553ee5a17ad2d4 ""
166166
"/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map" 1556127139 1863403 f3ff9a4253bcb5fb9a9baaf0c572cb01 ""
167167
"/var/lib/texmf/web2c/pdftex/pdflatex.fmt" 1556127159 3854047 41d616fd6b0ec4ee30d5039a0cf48801 ""
168-
"DFOLS.aux" 1581508569 11582 301043c01ea3382032845a942a9595e6 ""
168+
"DFOLS.aux" 1581509750 11582 301043c01ea3382032845a942a9595e6 ""
169169
"DFOLS.ind" 1533896586 0 d41d8cd98f00b204e9800998ecf8427e "makeindex DFOLS.idx"
170-
"DFOLS.out" 1581508569 8394 79ad965942e227c1e9bc996405ece3b5 ""
171-
"DFOLS.tex" 1581508566 82653 f5fcc7e005cc8897f1d973d0a0364fea ""
172-
"DFOLS.toc" 1581508569 4144 e547cdf6ac71953d726e6ede309997b0 ""
170+
"DFOLS.out" 1581509750 8394 79ad965942e227c1e9bc996405ece3b5 ""
171+
"DFOLS.tex" 1581509747 82981 6c92a6a238f621f57e674cc125649863 ""
172+
"DFOLS.toc" 1581509750 4144 e547cdf6ac71953d726e6ede309997b0 ""
173173
"data_fitting.png" 1517839082 29893 211bb1c28ea25d47c8c0990fbf39c55c ""
174174
"footnotehyper-sphinx.sty" 1581508046 8888 1bbd7bdeae8c8bed1d10d551bddb1cc9 ""
175175
"sphinx.sty" 1581508046 81878 44d14f90f8cb22a202794c148df60b64 ""
176-
"sphinxhighlight.sty" 1581508567 8137 93cbe0c10a29687032cb5b9b78b48dc2 ""
176+
"sphinxhighlight.sty" 1581509748 8137 f17c301def8beecbe3e05eb36a4aee2e ""
177177
"sphinxmanual.cls" 1581508046 4236 124cd90deb92742b5d3922bfc2cd70c0 ""
178-
"sphinxmessages.sty" 1581508568 745 3f5fcd6cdd7964ed608767954a8ced6f ""
178+
"sphinxmessages.sty" 1581509749 745 3f5fcd6cdd7964ed608767954a8ced6f ""
179179
"sphinxmulticell.sty" 1581508046 14606 0b6edc2b1a83546ed92026d1f6a311b5 ""
180180
(generated)
181181
"DFOLS.idx"
182182
"DFOLS.toc"
183-
"DFOLS.pdf"
184183
"DFOLS.out"
185-
"DFOLS.log"
186184
"DFOLS.aux"
185+
"DFOLS.pdf"
186+
"DFOLS.log"

docs/build/latex/DFOLS.fls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ INPUT /usr/share/texlive/texmf-dist/tex/latex/psnfss/t1pcr.fd
273273
INPUT /usr/share/texlive/texmf-dist/tex/latex/psnfss/t1pcr.fd
274274
INPUT /usr/share/texlive/texmf-dist/fonts/tfm/adobe/courier/pcrr8t.tfm
275275
INPUT /usr/share/texlive/texmf-dist/fonts/tfm/adobe/courier/pcrr8t.tfm
276-
INPUT /usr/share/texlive/texmf-dist/fonts/tfm/adobe/times/ptmr8t.tfm
277276
INPUT /usr/share/texlive/texmf-dist/fonts/vf/adobe/times/ptmr8c.vf
278277
INPUT /usr/share/texlive/texmf-dist/fonts/vf/adobe/times/ptmri8t.vf
279278
INPUT /usr/share/texlive/texmf-dist/fonts/tfm/adobe/times/ptmri8r.tfm
@@ -291,6 +290,7 @@ INPUT /usr/share/texlive/texmf-dist/fonts/tfm/adobe/courier/pcrb8r.tfm
291290
INPUT /usr/share/texlive/texmf-dist/tex/latex/psnfss/ts1pcr.fd
292291
INPUT /usr/share/texlive/texmf-dist/tex/latex/psnfss/ts1pcr.fd
293292
INPUT /usr/share/texlive/texmf-dist/fonts/tfm/adobe/courier/pcrr8c.tfm
293+
INPUT /usr/share/texlive/texmf-dist/fonts/tfm/adobe/times/ptmr8t.tfm
294294
INPUT /usr/share/texlive/texmf-dist/fonts/vf/adobe/courier/pcrr8c.vf
295295
INPUT /usr/share/texlive/texmf-dist/fonts/vf/adobe/times/ptmr8t.vf
296296
INPUT /usr/share/texlive/texmf-dist/fonts/tfm/adobe/times/ptmr8r.tfm

docs/build/latex/DFOLS.log

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2019.4.24) 12 FEB 2020 22:56
1+
This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2019.4.24) 12 FEB 2020 23:15
22
entering extended mode
33
restricted \write18 enabled.
44
%&-line parsing enabled.
@@ -1158,13 +1158,13 @@ LaTeX Font Info: Try loading font information for TS1+ptm on input line 121.
11581158
(/usr/share/texlive/texmf-dist/tex/latex/psnfss/ts1ptm.fd
11591159
File: ts1ptm.fd 2001/06/04 font definitions for TS1/ptm.
11601160
)
1161-
LaTeX Font Info: Try loading font information for T1+pcr on input line 147.
1161+
LaTeX Font Info: Try loading font information for T1+pcr on input line 152.
11621162

11631163
(/usr/share/texlive/texmf-dist/tex/latex/psnfss/t1pcr.fd
11641164
File: t1pcr.fd 2001/06/04 font definitions for T1/pcr.
11651165
) [3]
11661166
LaTeX Font Info: Font shape `T1/pcr/m/it' in size <9> not available
1167-
(Font) Font shape `T1/pcr/m/sl' tried instead on input line 216.
1167+
(Font) Font shape `T1/pcr/m/sl' tried instead on input line 221.
11681168
[4]
11691169
Chapter 2.
11701170
[5
@@ -1175,44 +1175,44 @@ Chapter 2.
11751175
Chapter 3.
11761176
[9]
11771177
LaTeX Font Info: Font shape `T1/pcr/bx/n' in size <9> not available
1178-
(Font) Font shape `T1/pcr/b/n' tried instead on input line 426.
1178+
(Font) Font shape `T1/pcr/b/n' tried instead on input line 431.
11791179
[10]
11801180
LaTeX Font Info: Try loading font information for TS1+pcr on input line 1.
11811181
(/usr/share/texlive/texmf-dist/tex/latex/psnfss/ts1pcr.fd
11821182
File: ts1pcr.fd 2001/06/04 font definitions for TS1/pcr.
11831183
) [11]
11841184
[12] [13]
1185-
Overfull \vbox (2.68167pt too high) detected at line 717
1185+
Overfull \vbox (2.68167pt too high) detected at line 722
11861186
[]
11871187

1188-
[14] [15] <data_fitting.png, id=388, 524.6802pt x 403.2666pt>
1188+
[14] [15] <data_fitting.png, id=389, 524.6802pt x 403.2666pt>
11891189
File: data_fitting.png Graphic file (type png)
11901190

11911191
<use data_fitting.png>
1192-
Package pdftex.def Info: data_fitting.png used on input line 817.
1192+
Package pdftex.def Info: data_fitting.png used on input line 822.
11931193
(pdftex.def) Requested size: 352.31625pt x 270.79639pt.
11941194
[16]
1195-
Overfull \vbox (2.92438pt too high) detected at line 877
1195+
Overfull \vbox (2.92438pt too high) detected at line 882
11961196
[]
11971197

11981198
[17 <./data_fitting.png>] [18]
11991199
Chapter 4.
12001200
[19
12011201

12021202
] [20]
1203-
Underfull \hbox (badness 10000) in paragraph at lines 1042--1043
1203+
Underfull \hbox (badness 10000) in paragraph at lines 1047--1048
12041204
[]\T1/pcr/m/n/10 regression.increase_num_extra_steps_with_restart \T1/ptm/m/n/1
12051205
0 - The amount to in-crease
12061206
[]
12071207

12081208

1209-
Underfull \hbox (badness 10000) in paragraph at lines 1077--1078
1209+
Underfull \hbox (badness 10000) in paragraph at lines 1082--1083
12101210
[]\T1/pcr/m/n/10 restarts.hard.increase_ndirs_initial_amt \T1/ptm/m/n/10 - Amou
12111211
nt to in-crease \T1/pcr/m/n/10 growing.
12121212
[]
12131213

12141214
[21]
1215-
Underfull \hbox (badness 8000) in paragraph at lines 1112--1113
1215+
Underfull \hbox (badness 8000) in paragraph at lines 1117--1118
12161216
\T1/ptm/m/n/10 De-fault is \T1/pcr/m/n/10 False \T1/ptm/m/n/10 if $\OML/cmm/m/i
12171217
t/10 m \OMS/cmsy/m/n/10 ^^U \OML/cmm/m/it/10 n$ \T1/ptm/m/n/10 and \T1/pcr/m/n/
12181218
10 True \T1/ptm/m/n/10 oth-er-wise (op-po-site to \T1/pcr/m/n/10 growing.full_r
@@ -1234,14 +1234,14 @@ Chapter 7.
12341234
] [30
12351235

12361236
] (./DFOLS.ind)
1237-
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 1386.
1237+
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 1391.
12381238
[31
12391239

12401240
]
1241-
Package atveryend Info: Empty hook `AfterLastShipout' on input line 1386.
1241+
Package atveryend Info: Empty hook `AfterLastShipout' on input line 1391.
12421242
(./DFOLS.aux)
1243-
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 1386.
1244-
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 1386.
1243+
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 1391.
1244+
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 1391.
12451245

12461246
Package rerunfilecheck Info: File `DFOLS.out' has not changed.
12471247
(rerunfilecheck) Checksum: 79AD965942E227C1E9BC996405ECE3B5;8394.
@@ -1273,10 +1273,10 @@ lvetic/uhvb8a.pfb></usr/share/texlive/texmf-dist/fonts/type1/urw/helvetic/uhvbo
12731273
8a.pfb></usr/share/texlive/texmf-dist/fonts/type1/urw/times/utmb8a.pfb></usr/sh
12741274
are/texlive/texmf-dist/fonts/type1/urw/times/utmr8a.pfb></usr/share/texlive/tex
12751275
mf-dist/fonts/type1/urw/times/utmri8a.pfb>
1276-
Output written on DFOLS.pdf (35 pages, 299620 bytes).
1276+
Output written on DFOLS.pdf (35 pages, 299805 bytes).
12771277
PDF statistics:
1278-
566 PDF objects out of 1000 (max. 8388607)
1279-
497 compressed objects within 5 object streams
1278+
567 PDF objects out of 1000 (max. 8388607)
1279+
498 compressed objects within 5 object streams
12801280
92 named destinations out of 1000 (max. 500000)
12811281
426 words of extra memory for PDF output out of 10000 (max. 10000000)
12821282

docs/build/latex/DFOLS.pdf

185 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)