Skip to content
Permalink
Browse files

Merge pull request #428 from hcmlab/develop

Develop
  • Loading branch information...
tobiasbaur committed Oct 18, 2019
2 parents ed4e1b5 + 5c65290 commit 526c350630332fb6b3225305a9540eef645c0098
Showing with 44 additions and 13 deletions.
  1. +1 −1 Controls/MainHandler.cs
  2. +2 −2 Controls/MainHandlerDownload.cs
  3. +10 −1 Controls/MainHandlerUpdate.cs
  4. BIN bin/nova.exe
  5. +17 −6 docs/index.html
  6. +14 −3 docs/index.md
@@ -16,7 +16,7 @@ public partial class MainHandler
{

//Config
public static string BuildVersion = "1.0.6.1";
public static string BuildVersion = "1.0.6.2";
public static MEDIABACKEND MediaBackend = MEDIABACKEND.MEDIAKIT;
public static bool ENABLE_PYTHON = Properties.Settings.Default.EnablePython;
public static int xaiProcessId;
@@ -538,7 +538,7 @@ private void GetPython()
"python/toolz-0.9.0-py2.py3-none-any.whl",
"python/termcolor-1.1.0-py2.py3-none-any.whl",
"python/future-0.17.0-py3-none-any.whl",
"keras-vggface==0.5",
"keras-vggface==0.6",
"tensorflow-gpu==1.12.0",
"imageio==2.3.0",
"h5py==2.8.0",
@@ -551,7 +551,7 @@ private void GetPython()
"Pillow==5.4.1",
"opencv-python==4.0.0.21",
"numpy==1.17.0",
"resampy",
"resampy==0.2.1",
"flask"

};
@@ -102,7 +102,16 @@ private async void checkForCMLUpdates(bool silent = false)
var commits = await client.Repository.Commit.GetAll("hcmlab", "ssi");
var first = commits.First();
var last = commits.Last();
var result = await client.Repository.Commit.Compare("hcmlab", "ssi", last.Sha, first.Sha);
CompareResult result = null;
try
{
result = await client.Repository.Commit.Compare("hcmlab", "ssi", last.Sha, first.Sha);
}
catch(Exception en)
{
MessageBox.Show(en.ToString());
}



var files = result.Files;
BIN +0 Bytes (100%) bin/nova.exe
Binary file not shown.
@@ -679,20 +679,31 @@ <h1 id="database"><span class="header-section-number">4</span> Database</h1>
<h2 id="setup-mongodb"><span class="header-section-number">4.1</span> Setup MongoDB</h2>
<p>We will describe two strategies: a) set up MongoDB with Docker <em>or</em> b) set up MongoDB natively. In the following, make sure to replace the default password &quot;PASSWORD&quot;.</p>
<p>First, we install Docker (<a href="https://www.docker.com/" class="uri">https://www.docker.com/</a>) and run:</p>
<pre><code>docker pull mongo:latest
docker run --restart always -p 27017:27017 -h mongodb.local --name nova -d -t mongo:latest --auth</code></pre>
<pre><code>docker pull mongo:3.6.0
docker run -d -p 27017-27019:27017-27019 --name nova mongo:3.6.0

</code></pre>
<p><em>or</em></p>
<p>We install MongoDB (<a href="https://www.mongodb.com/download-center#community" class="uri">https://www.mongodb.com/download-center#community</a>) and run:</p>
<pre><code>mongod --auth</code></pre>
<p>Alternativly, if you want to run MongoDB as a service, see below.</p>
<p>MongoDB now runs on 127.0.0.1:27017 and we can connect to it:</p>
<pre><code>docker exec -it nova mongo admin</code></pre>
<pre><code>
docker exec -it nova bash

Enter:
mongo
</code></pre>
<p><em>or</em></p>
<pre><code>mongo admin</code></pre>
<p>We add an administrator:</p>
<pre><code>use admin
db.createUser({ user: &#39;admin&#39;, pwd: &#39;PASSWORD&#39;, roles: [ { role: &quot;root&quot;, db: &quot;admin&quot; } ], customData: {fullname: &quot;ADMIN&quot;, email: &#39; &#39;, expertise: NumberInt(0)}});
exit</code></pre>
exit

Enter:
exit
</code></pre>
<p>And reconnect afterwards:</p>
<pre><code>docker exec -it nova mongo -u admin -p PASSWORD --authenticationDatabase admin </code></pre>
<p><em>or</em></p>
@@ -885,12 +896,12 @@ <h2 id="annotation-prediction"><span class="header-section-number">5.5</span> An
<h2 id="explanation"><span class="header-section-number">5.6</span> Explanation</h2>
<p>We extended NOVA with the two explanation frameworks <a href="https://github.com/marcotcr/lime">LIME</a> and <a href="https://github.com/albermax/innvestigate">iNNvestigate</a>. The extension allows to further investigate the classifier's prediction and gain additional insight on the classifier’s decision making. The corresponding functionality is accessible through the 'XAI' drop down menu from the navigation bar at the top.</p>
<div class="figure">
<img src="pics/lime-explanation.png" alt="Lime explanation dialog." id="fig:lime-explanation" style="width:80.0%" />
<img src="pics/lime-explanation.PNG" alt="Lime explanation dialog." id="fig:lime-explanation" style="width:80.0%" />
<p class="caption"><em>Lime explanation dialog.</em></p>
</div>
<p>The figure presents the NOVA interface for generating explanations with LIME. Coherent with LIME it is possible to adjust the number of considered 'Top Lables', 'Number of samples' and 'Number of features'. Additional settings for the presentation of explanations can also be altered ('Hide rest', 'Hide color', 'Positive only'). Furthermore, for the generation of explanations the user can either choose from a list of models that have been trained with the help of NOVA for the given modality or drag and drop models from a different source.</p>
<div class="figure">
<img src="pics/innvestigate-explanation.png" alt="Innvestigate explanation dialog." id="fig:innvestigate-explanation" style="width:80.0%" />
<img src="pics/innvestigate-explanation.PNG" alt="Innvestigate explanation dialog." id="fig:innvestigate-explanation" style="width:80.0%" />
<p class="caption"><em>Innvestigate explanation dialog.</em></p>
</div>
<p>Alongside the explanation generated by LIME, NOVA also offers the possibility to create explanations with iNNvestigate. The figure above presents the corresponding NOVA interface. It not only provides a variety of algorithms implemented in iNNvestigate, but also allows the user to decide between different visualization representations. Following algorithms (explainer) are supported in NOVA:</p>
@@ -357,8 +357,10 @@ We will describe two strategies: a) set up MongoDB with Docker *or* b) set up Mo
First, we install Docker (<https://www.docker.com/>) and run:

~~~~
docker pull mongo:latest
docker run --restart always -p 27017:27017 -h mongodb.local --name nova -d -t mongo:latest --auth
docker pull mongo:3.6.0
docker run -d -p 27017-27019:27017-27019 --name nova mongo:3.6.0
~~~~

*or*
@@ -375,7 +377,12 @@ MongoDB now runs on 127.0.0.1:27017 and we can connect to it:


~~~~
docker exec -it nova mongo admin
docker exec -it nova bash
Enter:
mongo
~~~~

*or*
@@ -390,6 +397,10 @@ We add an administrator:
use admin
db.createUser({ user: 'admin', pwd: 'PASSWORD', roles: [ { role: "root", db: "admin" } ], customData: {fullname: "ADMIN", email: ' ', expertise: NumberInt(0)}});
exit
Enter:
exit
~~~~

And reconnect afterwards:

0 comments on commit 526c350

Please sign in to comment.
You can’t perform that action at this time.