Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabfab1
fabfab1 committed Mar 4, 2020
2 parents 2e75b5a + 63b86ce commit 739ca24
Show file tree
Hide file tree
Showing 22 changed files with 139 additions and 269 deletions.
41 changes: 0 additions & 41 deletions EnCAB/log inprogress.txt
View file

This file was deleted.

20 changes: 1 addition & 19 deletions EnCAB/log.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
----------------------------------------------2020-03-02T22:42:46+01:00
----------------------------------------------2020-03-04T10:56:41+01:00
EnCAB: Energetic Calculator for Ancient Buildings
-----------------------------------------------------------------------

Expand All @@ -13,24 +13,6 @@ Index template: "templates/index.html"

[*] Generating indexes...
[*] Importing algorithms data...
[ERROR] Bibliographical problems
Burke_2012_150_3.xml: author "HallG_etal" not found.
Fitzsimons_2014_96.xml: author "Time-LifeBooks" not found.
Harper_2016_519_6.xml: author "Hornbostel" not found.
Harper_2016_519_7.xml: author "Arthur" not found.
Harper_2016_522_2.xml: author "Atkinson" not found.
Harper_2016_525_1.xml: author "RusselandDahlin" not found.
Harper_2016_527_3.xml: author "LeksonS" not found.
Harper_2016_527_4.xml: author "LeksonS" not found.
Kerig_2007_2.xml: author "Luley" not found.
Pickett_2016_106_2.xml: author "USCommissionofFishandFisheries" not found.
Pickett_2016_106_3.xml: author "Radford" not found.
UN_1957_1.xml: author "Taniguchi" not found.
UN_1957_2.xml: author "Taniguchi" not found.
UN_1957_3.xml: author "Taniguchi" not found.
UN_1957_4.xml: author "Taniguchi" not found.
UN_1957_5.xml: author "Taniguchi" not found.

[ERROR] Missing_file problems
Harper_2016_519_2.xml: material "conglomerate" not found.
Harper_2016_520_1.xml: algorithm_type "quarrying_conglomerate" not found, material "conglomerate" not found.
Expand Down
32 changes: 16 additions & 16 deletions docs/algorithms/algorithm_bibliography.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3650,8 +3650,8 @@ <h4> Algorithms: </h4>
<b>Harper&nbsp;2016&nbsp;519&nbsp;1</b>
<table class="data">
<tr>
<td class="col-1 Alg-Statement">Alg Statement:</td><td class="col-2 Alg-Statement-input">1 cubic metre of dried brick weights 1440 kg</td>
<td class="col-3 Alg-Math">Alg Math:</td><td class="col-4 Alg-Math-input">1 m3 weights 1440 kg</td>
<td class="col-1 Alg-Statement">Alg Statement:</td><td class="col-2 Alg-Statement-input">1 cubic metre of dried brick weighs 1440 kg</td>
<td class="col-3 Alg-Math">Alg Math:</td><td class="col-4 Alg-Math-input">1 m3 weighs 1440 kg</td>
</tr>
<tr>
<td colspan="4">
Expand Down Expand Up @@ -4007,7 +4007,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#HarperCR">HarperCR 2016</a>, p. 519
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Hornbostel">Hornbostel 1991</a>, p. 83
<a href="../bibliography/bibliography.html#HornbostelC">HornbostelC 1991</a>, p. 83
</td>
</tr>
<tr>
Expand All @@ -4026,7 +4026,7 @@ <h4> Algorithms: </h4>
<td>Notes:</td><td colspan="3"></td>
</tr>
<tr>
<td>Notes on bibliography:</td><td colspan="3"></td>
<td>Notes on bibliography:</td><td colspan="3">Harper cites Hornbostel (Hornbostel 1991, 83) in the text, but the work cited is not present in the bibliography. The bibliography given here for Hornbostel 1991 is a best-guess of the work Harper refers to.</td>
</tr>
<tr>
<td>How to cite (<a href="../cite/cite.html">guidelines</a>):</td><td>
Expand Down Expand Up @@ -4074,7 +4074,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#HarperCR">HarperCR 2016</a>, p. 519
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Arthur">Arthur 1913</a>, p. 407
<a href="../bibliography/bibliography.html#ArthurW">ArthurW 1913</a>, p. 407
</td>
</tr>
<tr>
Expand All @@ -4093,7 +4093,7 @@ <h4> Algorithms: </h4>
<td>Notes:</td><td colspan="3"></td>
</tr>
<tr>
<td>Notes on bibliography:</td><td colspan="3"></td>
<td>Notes on bibliography:</td><td colspan="3">Harper cites Arthur (Arthur 1913, 407) in the text, but the work cited is not present in the bibliography. The bibliography given here for Arthur 1913 is a best-guess of the work Harper refers to.</td>
</tr>
<tr>
<td>How to cite (<a href="../cite/cite.html">guidelines</a>):</td><td>
Expand Down Expand Up @@ -4692,7 +4692,7 @@ <h4> Algorithms: </h4>
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#DevolderM">DevolderM 2013</a>, p. 24-7;
<a href="../bibliography/bibliography.html#Atkinson">Atkinson 1961</a>, p. 297
<a href="../bibliography/bibliography.html#AtkinsonRC">AtkinsonRC 1961</a>, p. 297
</td>
</tr>
<tr>
Expand Down Expand Up @@ -4826,7 +4826,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#HarperCR">HarperCR 2016</a>, p. 525
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#RusselandDahlin">RusselandDahlin 2007</a>, p. 417
<a href="../bibliography/bibliography.html#RussellBW_DahlinBH">RussellBW DahlinBH 2007</a>, p. 417
</td>
</tr>
<tr>
Expand Down Expand Up @@ -5963,7 +5963,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#KerigT">KerigT 2007</a>, p. 2
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Luley">Luley 1990</a>
<a href="../bibliography/bibliography.html#LuleyH">LuleyH 1990</a>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -6296,7 +6296,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#PickettJ">PickettJ 2016</a>, p. 106
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Radford">Radford 1913</a>, p. 129
<a href="../bibliography/bibliography.html#RadfordWA">RadfordWA 1913</a>, p. 129
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8310,7 +8310,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8377,7 +8377,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8444,7 +8444,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8511,7 +8511,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8578,7 +8578,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8677,7 +8677,7 @@ <h4> Algorithms: </h4>

Generated on
<script>
var d = new Date(1583185367130);
var d = new Date(1583315801475);
document.write(d.toLocaleDateString(undefined, { day:'2-digit', month:'short', year:'numeric', hour:'2-digit', minute:'2-digit', timeZoneName:'short' }));
</script>.

Expand Down
32 changes: 16 additions & 16 deletions docs/algorithms/algorithm_materials.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#PickettJ">PickettJ 2016</a>, p. 106
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Radford">Radford 1913</a>, p. 129
<a href="../bibliography/bibliography.html#RadfordWA">RadfordWA 1913</a>, p. 129
</td>
</tr>
<tr>
Expand Down Expand Up @@ -1948,7 +1948,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -2015,7 +2015,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -2082,7 +2082,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -2149,7 +2149,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -2216,7 +2216,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#UN">UN 1957</a>, p. 7
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Taniguchi">Taniguchi</a>, p. 55
<a href="../bibliography/bibliography.html#TaniguchiS">TaniguchiS</a>, p. 55
</td>
</tr>
<tr>
Expand Down Expand Up @@ -2484,7 +2484,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#HarperCR">HarperCR 2016</a>, p. 525
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#RusselandDahlin">RusselandDahlin 2007</a>, p. 417
<a href="../bibliography/bibliography.html#RussellBW_DahlinBH">RussellBW DahlinBH 2007</a>, p. 417
</td>
</tr>
<tr>
Expand Down Expand Up @@ -4143,8 +4143,8 @@ <h4> Algorithms: </h4>
<b>Harper&nbsp;2016&nbsp;519&nbsp;1</b>
<table class="data">
<tr>
<td class="col-1 Alg-Statement">Alg Statement:</td><td class="col-2 Alg-Statement-input">1 cubic metre of dried brick weights 1440 kg</td>
<td class="col-3 Alg-Math">Alg Math:</td><td class="col-4 Alg-Math-input">1 m3 weights 1440 kg</td>
<td class="col-1 Alg-Statement">Alg Statement:</td><td class="col-2 Alg-Statement-input">1 cubic metre of dried brick weighs 1440 kg</td>
<td class="col-3 Alg-Math">Alg Math:</td><td class="col-4 Alg-Math-input">1 m3 weighs 1440 kg</td>
</tr>
<tr>
<td colspan="4">
Expand Down Expand Up @@ -6397,7 +6397,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#HarperCR">HarperCR 2016</a>, p. 519
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Hornbostel">Hornbostel 1991</a>, p. 83
<a href="../bibliography/bibliography.html#HornbostelC">HornbostelC 1991</a>, p. 83
</td>
</tr>
<tr>
Expand All @@ -6416,7 +6416,7 @@ <h4> Algorithms: </h4>
<td>Notes:</td><td colspan="3"></td>
</tr>
<tr>
<td>Notes on bibliography:</td><td colspan="3"></td>
<td>Notes on bibliography:</td><td colspan="3">Harper cites Hornbostel (Hornbostel 1991, 83) in the text, but the work cited is not present in the bibliography. The bibliography given here for Hornbostel 1991 is a best-guess of the work Harper refers to.</td>
</tr>
<tr>
<td>How to cite (<a href="../cite/cite.html">guidelines</a>):</td><td>
Expand Down Expand Up @@ -6464,7 +6464,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#HarperCR">HarperCR 2016</a>, p. 519
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Arthur">Arthur 1913</a>, p. 407
<a href="../bibliography/bibliography.html#ArthurW">ArthurW 1913</a>, p. 407
</td>
</tr>
<tr>
Expand All @@ -6483,7 +6483,7 @@ <h4> Algorithms: </h4>
<td>Notes:</td><td colspan="3"></td>
</tr>
<tr>
<td>Notes on bibliography:</td><td colspan="3"></td>
<td>Notes on bibliography:</td><td colspan="3">Harper cites Arthur (Arthur 1913, 407) in the text, but the work cited is not present in the bibliography. The bibliography given here for Arthur 1913 is a best-guess of the work Harper refers to.</td>
</tr>
<tr>
<td>How to cite (<a href="../cite/cite.html">guidelines</a>):</td><td>
Expand Down Expand Up @@ -8489,7 +8489,7 @@ <h4> Algorithms: </h4>
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#DevolderM">DevolderM 2013</a>, p. 24-7;
<a href="../bibliography/bibliography.html#Atkinson">Atkinson 1961</a>, p. 297
<a href="../bibliography/bibliography.html#AtkinsonRC">AtkinsonRC 1961</a>, p. 297
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8623,7 +8623,7 @@ <h4> Algorithms: </h4>
<a href="../bibliography/bibliography.html#KerigT">KerigT 2007</a>, p. 2
</td>
<td>Also cited in:</td><td>
<a href="../bibliography/bibliography.html#Luley">Luley 1990</a>
<a href="../bibliography/bibliography.html#LuleyH">LuleyH 1990</a>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -8668,7 +8668,7 @@ <h4> Algorithms: </h4>

Generated on
<script>
var d = new Date(1583185367130);
var d = new Date(1583315801475);
document.write(d.toLocaleDateString(undefined, { day:'2-digit', month:'short', year:'numeric', hour:'2-digit', minute:'2-digit', timeZoneName:'short' }));
</script>.

Expand Down
Loading

0 comments on commit 739ca24

Please sign in to comment.