diff options
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 130 |
1 files changed, 36 insertions, 94 deletions
@@ -288,8 +288,8 @@ <div class="step slide" data-x="6000" data-y="6000" data-z="2500"> <h3>(Eine geht noch.)</h3> - <p style="text-align: center; margin-top: 1.5em;"> - Berechneter MEDV-Wert: <span class="calculated">lade…</span> - Erwarteter MEDV-Wert: <span class="expected">lade…</span> + <p style="text-align: center; font-size: 175%;"> + Berechneter MEDV-Wert: <span class="calculated">lade…</span> - Erwarteter MEDV-Wert: <span class="expected">lade…</span> <button class="mdl-button mdl-js-button btn-calc"><i class="material-icons">redo</i></button> </p> <div class="visContainer"></div> @@ -302,12 +302,16 @@ weightsWrapper.openIn(c, true); weightsWrapper.jumpTo(0); function calc() { - var row = Math.floor(Math.random()*bostonset.length()), - inputs = bostonset.inputs(row), - calculated = bostonset.asOutput(weightsWrapper.calculate(inputs, 0)[0]), + var inputs, calculated, expected; + do { + var row = Math.floor(Math.random()*bostonset.length()); + inputs = bostonset.inputs(row); + calculated = bostonset.asOutput(weightsWrapper.calculate(inputs, 0)[0]); expected = bostonset.expectedOutput(row); - d3.select(c).select(".calculated").text(calculated.toString()); - d3.select(c).select(".expected").text(expected.toString()); + console.log("calc", calculated, expected); + } while (Math.abs(calculated - expected) < 15); + d3.select(c).select(".calculated").text(calculated.toString()); + d3.select(c).select(".expected").text(expected.toString()); } calc(); d3.select(c).select(".btn-calc").on("click", calc); @@ -367,63 +371,32 @@ <div class="step slide" data-x="10000" data-y="0" data-z="5000"> <h3 class="emoji">Test :open_mouth:</h3> - </div> - - <div class="step slide" data-x="0" data-y="0" data-z="0" data-rotate-x="90"> - <h1 class="emoji">:blush:</h1> - </div> - - <div id="overview" class="step" data-x="2000" data-y="3000" data-scale="20"> - <!-- overview --> - </div> - - <!-- v - alter Code unten - v --> - <!-- - <div class="step slide" data-x="9500" data-y="0" data-z="1000"> - <div> - <h3>Ein leeres Netz</h3> - </div> - <div class="visContainer"></div> - - <script type="text/javascript"> - var mocker = new WeightVisWrapper(); - new VisIntegrater(function(c) { - mocker.mock([3, 2, 1], function() { - mocker.openIn(c, false); - }); - }, function(c) { - mocker.remove(c); - }, ".visContainer"); - </script> - </div> - - <div class="step slide" data-x="3000" data-y="0" data-z="1000"> - <div> - <h3>Aktivierungstest</h3> - </div> - - <div class="visContainer"></div> - <p style="text-align: center; margin-top: 1.5em;">Berechneter MEDV-Wert: <span id="bsCalculated">lade…</span> - Erwarteter MEDV-Wert: <span id="bsExpected">lade…</span></p> + <p style="text-align: center; font-size: 175%;"> + Berechneter MEDV-Wert: <span class="calculated">lade…</span> - Erwarteter MEDV-Wert: <span class="expected">lade…</span> + <button class="mdl-button mdl-js-button btn-calc"><i class="material-icons">redo</i></button> + </p> <script type="text/javascript"> new VisIntegrater(function(c) { weightsWrapper.afterLoad(function() { weightsWrapper.jumpTo(weightsWrapper.steps()-1); weightsWrapper.openIn(c, false); - var testRows = [400, 175, 454, 481, 476, 364, 377, 75, 103, 84, 458, 483]; // from original test data - var row = 0, - inputs =[]; - var calculated, expected; - do { - row = Math.floor(Math.random()*bostonset.length()); - inputs = bostonset.inputs(row); - calculated = bostonset.asOutput(weightsWrapper.calculate(inputs)[0]); - expected = bostonset.expectedOutput(row); - } while(Math.abs(calculated - expected) > 5); - d3.select("#bsCalculated").text(calculated.toString()); - d3.select("#bsExpected").text(expected.toString()); - weightsWrapper.activate(inputs); + function calc() { + var inputs, calculated, expected; + do { + var row = Math.floor(Math.random()*bostonset.length()); + inputs = bostonset.inputs(row); + calculated = bostonset.asOutput(weightsWrapper.calculate(inputs)[0]); + expected = bostonset.expectedOutput(row); + console.log("calc", calculated, expected); + } while (Math.abs(calculated - expected) > 3); + d3.select(c).select(".calculated").text(calculated.toString()); + d3.select(c).select(".expected").text(expected.toString()); + weightsWrapper.activate(inputs); + } + calc(); + d3.select(c).select(".btn-calc").on("click", calc); }); }, function(c) { weightsWrapper.remove(c); @@ -431,42 +404,8 @@ </script> </div> - <div class="step slide" data-x="2000" data-y="0" data-z="1000"> - <div> - <h3>Der Fehler im Verlauf</h3> - </div> - - <div class="errorContainer"></div> - - <script type="text/javascript"> - new VisIntegrater(function(c) { - errorVis.afterLoad(function() { - errorVis.openIn(c, true); - errorVis.showMarker(203); - }); - }, function(c) { - errorVis.remove(c); - }, ".errorContainer"); - </script> - </div> - - <div class="step slide" data-x="0" data-y="1000"> - <div> - <h3>Die Gewichte im Verlauf</h3> - </div> - - <div class="visContainer"></div> - - <script type="text/javascript"> - new VisIntegrater(function(c) { - weightsWrapper.afterLoad(function() { - weightsWrapper.openIn(c, true); - weightsWrapper.animate(10, 10); - }); - }, function(c) { - weightsWrapper.remove(c); - }, ".visContainer"); - </script> + <div class="step slide" data-x="0" data-y="0" data-z="0" data-rotate-x="90"> + <h1 class="emoji">:blush:</h1> </div> <div class="step slide" data-x="12000" data-y="0" data-z="5000"> @@ -476,7 +415,10 @@ <div class="step slide" data-x="0" data-y="0" data-z="0" data-rotate-x="90"> <h1 class="emoji">:blush:</h1> </div> - --> + + <div id="overview" class="step" data-x="2000" data-y="3000" data-scale="20"> + <!-- overview --> + </div> </div> </body> </html> |