From e725e4ccf3f220e8ab74e8fc9d5bfb1c17e1e1e3 Mon Sep 17 00:00:00 2001 From: Selvam Palanimalai Date: Mon, 4 Sep 2017 20:58:04 -0400 Subject: [PATCH 1/3] bumping version on homepage to 0.3.2 --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 31670b9..beb6d4a 100644 --- a/index.html +++ b/index.html @@ -389,7 +389,7 @@

ABOUT

The goal of this project is to design a modern and portable SOCR web-app that demonstrates the concepts of statistical analysis such as resampling, randomization and probabilistic simulation and runs seamlessly across varied devices.

-

Current Version: 0.1.2

+

Current Version: 0.3.2

Created by SOCR @ UMich . Code available under MIT Licence at Github


Please send an email to selvam.palanimalai@gmail.com to report bugs.

From 74fc7d785d56fba9afa539245f9c47d9a617db51 Mon Sep 17 00:00:00 2001 From: Selvam Palanimalai Date: Fri, 19 Jan 2018 01:47:49 -0500 Subject: [PATCH 2/3] fixing precision bug. defaults to 4. can be set to any value --- dist/bundle.js | 79 +++++++++++++++++++++-------------- dist/partials/controller.tmpl | 2 +- src/appController.coffee | 62 ++++++++++++++++----------- src/appView.coffee | 19 ++++++--- src/partials/controller.tmpl | 2 +- 5 files changed, 100 insertions(+), 64 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index 3fb904e..8c3f4c9 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -9150,16 +9150,19 @@ SOCR - Statistical Online Computational Resource /* @method: createDotPlot @description: Dot plot tab in the accordion is populated by this call. - Call invoked when "infer" button pressed in the controller tile. + "infer" button pressed in the controller tile -> appController -> appModel -> publishes "setInferenceSettingComplete". @return : {boolean} */ createDotplot: function(setting) { - var binNo, datum, dotplot, e, end, err, flag, index, lSide, pvalue, rSide, start, stop, temp, total, values; + var binNo, datum, dotplot, e, end, err, flag, index, lSide, pvalue, rSide, start, stop, temp, total, values, __accordionDOMSelector__, __dotPlotDOMSelector__; + __dotPlotDOMSelector__ = "#dotplot"; + __accordionDOMSelector__ = "#accordion"; + $(__dotPlotDOMSelector__).html(""); if (setting.variable == null) { throw new Error("invalid arguments: settings"); } _currentVariable = setting.variable; - $("#accordion").accordion("activate", 2); + $(__accordionDOMSelector__).accordion("activate", 2); Array.max = function(array) { return Math.max.apply(Math, array); }; @@ -9251,9 +9254,12 @@ SOCR - Statistical Online Computational Resource } binNo = ($("input[name=\"binno\"]").val() !== "" ? $("input[name=\"binno\"]").val() : 10); _currentValues = values; + datum = Math.round(datum * Math.pow(10, setting.precision)) / Math.pow(10, setting.precision); + lSide = Math.round(lSide * Math.pow(10, setting.precision)) / Math.pow(10, setting.precision); + rSide = Math.round(rSide * Math.pow(10, setting.precision)) / Math.pow(10, setting.precision); try { dotplot = socr.vis.generate({ - parent: "#dotplot", + parent: __dotPlotDOMSelector__, data: values, height: 390, range: [start, stop], @@ -9261,8 +9267,7 @@ SOCR - Statistical Online Computational Resource bins: binNo, variable: setting.variable, pl: lSide, - pr: rSide, - precision: setting.precision + pr: rSide }); } catch (_error) { e = _error; @@ -9459,7 +9464,18 @@ SOCR - Statistical Online Computational Resource (function() { socr.controller = function(model, view) { - var MIN_SAMPLE_GENERATION_STEP_COUNT, MIN_SAMPLE_GENERATION_STEP_TIME, _currentMode, _generate, _id, _noOfSteps, _runCount, _runsElapsed, _this; + var MIN_SAMPLE_GENERATION_STEP_COUNT, MIN_SAMPLE_GENERATION_STEP_TIME, __accordionDOMSelector__, __controllerBackBtnDOMSelector__, __inferBtnDOMSelector__, __inferenceAnalysisDOMSelector__, __inferenceDatasetIndexDOMSelector__, __inferencePrecisionDOMSelector__, __inferenceVariableDOMSelector__, __resetBtnDOMSelector__, __runBtnDOMSelector__, __stepBtnDOMSelector__, __stopBtnDOMSelector__, _currentMode, _generate, _id, _noOfSteps, _runCount, _runsElapsed, _this; + __accordionDOMSelector__ = "#accordion"; + __controllerBackBtnDOMSelector__ = ".controller-back"; + __runBtnDOMSelector__ = "#runButton"; + __stepBtnDOMSelector__ = "#stepButton"; + __stopBtnDOMSelector__ = "#stopButton"; + __resetBtnDOMSelector__ = "#resetButton"; + __inferBtnDOMSelector__ = "#infer"; + __inferenceDatasetIndexDOMSelector__ = "#index"; + __inferenceVariableDOMSelector__ = "#variable"; + __inferenceAnalysisDOMSelector__ = "#analysis"; + __inferencePrecisionDOMSelector__ = '#result-precision'; _id = 0; _runsElapsed = 0; _runCount = 0; @@ -9570,7 +9586,7 @@ SOCR - Statistical Online Computational Resource var e; model.setK(); $(".tooltips").tooltip(); - $(".controller-back").on("click", function(e) { + $(__controllerBackBtnDOMSelector__).on("click", function(e) { var err; e.preventDefault(); try { @@ -9584,28 +9600,28 @@ SOCR - Statistical Online Computational Resource console.log(err.message); } }); - $("#runButton").on("click", function(e) { + $(__runBtnDOMSelector__).on("click", function(e) { e.preventDefault(); console.log("Run Started"); setTimeout(socr.controller.run, 500); }); - $("#stepButton").on("click", function(e) { + $(__stepBtnDOMSelector__).on("click", function(e) { e.preventDefault(); console.log("Step pressed "); socr.controller.step(); }); - $("#stopButton").on("click", function(e) { + $(__stopBtnDOMSelector__).on("click", function(e) { e.preventDefault(); console.log("Stop Pressed "); socr.controller.stop(); PubSub.publish("randomSampleGenerationInterrupted", {}); }); - $("#resetButton").on("click", function(e) { + $(__resetBtnDOMSelector__).on("click", function(e) { e.preventDefault(); console.log("Reset pressed"); socr.controller.reset(); }); - $("#infer").on("click", function(e) { + $(__inferBtnDOMSelector__).on("click", function(e) { e.preventDefault(); if (model.getSample(1) === false) { view.handleResponse("

No Random samples to infer From!

Please generate some random samples in Step 2. ", "error", "controller-content"); @@ -9617,21 +9633,21 @@ SOCR - Statistical Online Computational Resource setTimeout(socr.controller.setDotplot, 500); } }); - $("#variable").on("change", function() { + $(__inferenceVariableDOMSelector__).on("change", function() { if ($(this).val() === "Mean" || $(this).val() === "Count") { - $("#index").attr("disabled", false); + $(__inferenceDatasetIndexDOMSelector__).attr("disabled", false); } else { - $("#index").attr("disabled", true); + $(__inferenceDatasetIndexDOMSelector__).attr("disabled", true); } }); - $("#analysis").on("change", function() { + $(__inferenceAnalysisDOMSelector__).on("change", function() { var el; if (socr.analysis[$(this).val()] !== "undefined") { el = ""; $.each(socr.analysis[$(this).val()]["variables"], function(key, value) { el += ""; }); - $("#variable").html(el); + $(__inferenceVariableDOMSelector__).html(el); } }); $(".update").on("click", function() { @@ -9659,7 +9675,7 @@ SOCR - Statistical Online Computational Resource */ step: function() { var e; - $("#accordion").accordion("activate", 1); + $(__accordionDOMSelector__).accordion("activate", 1); view.disableButtons(); try { model.generateSample(); @@ -9757,20 +9773,20 @@ SOCR - Statistical Online Computational Resource } }); }, + + /* + @description : When user clicks "infer" button, setDotplot is triggered. + */ setDotplot: function(precision) { - var index; - $("#dotplot").html(""); - index = parseInt($("#index").val()); - precision = $('#result-precision').attr('checked'); - if (precision === "checked") { - precision = 3; - } - console.log("setdotplot started", "variable:" + $("#variable").val()); + var inferenceDatasetIndex, inferencePrecision; + inferenceDatasetIndex = parseInt($(__inferenceDatasetIndexDOMSelector__).val()); + inferencePrecision = $(__inferencePrecisionDOMSelector__).val() || 4; + console.log("setdotplot started", "variable:" + $(__inferenceVariableDOMSelector__).val()); model.setInferenceSettings({ - analysis: $("#analysis").val(), - variable: $("#variable").val(), - precision: precision, - index: index + analysis: $(__inferenceAnalysisDOMSelector__).val(), + variable: $(__inferenceVariableDOMSelector__).val(), + precision: inferencePrecision, + index: inferenceDatasetIndex }); }, @@ -23458,7 +23474,6 @@ if (!Array.prototype.filter) { })(jQuery, window, Handsontable); $(document).ready(function(){ - debugger socr.dataTable = (function () { $dataTable = $('#input'); var $controls = $('section.controls'); diff --git a/dist/partials/controller.tmpl b/dist/partials/controller.tmpl index 2600e71..4d8ef4c 100644 --- a/dist/partials/controller.tmpl +++ b/dist/partials/controller.tmpl @@ -79,7 +79,7 @@ -

Precision to 3 decimal places.

+

Precision to decimal places.