showing inferenceType in simulationInfo tab

Author: chartotu19

src/appController.coffee

@@ -194,7 +194,7 @@ socr.controller = (model, view) ->
       e.preventDefault()
 
       if model.getSample(1) is false
-        view.handleResponse "<h4 class=\"alert-heading\">No Random samples to infer From!</h4>Please generate some random samples. Click \"back\" button on the controller to go to the \"Generate Random Samples!\" button.", "error", "controller-content"
+        view.handleResponse "<h4 class=\"alert-heading\">No Random samples to infer From!</h4>Please generate some random samples in Step 2. ", "error", "controller-content"
       else
         view.toggleControllerHandle "hide"
         PubSub.publish "toggleLoadingSpinner" ,{action:'show'}
@@ -248,7 +248,7 @@ socr.controller = (model, view) ->
     try
       model.generateSample() #generate one sample
       $(".removable").remove() #remove the previously generated canvas during animation
-      PubSub.publish "randomSampleGenerationComplete"
+      PubSub.publish "randomSampleGenerationComplete", {'sampleCount':model.getRSampleCount()}
     catch e
       console.log e
     view.enableButtons()
@@ -313,7 +313,7 @@ socr.controller = (model, view) ->
     d = Date()
     console.log "end" + _runsElapsed + d
 
-    PubSub.publish "randomSampleGenerationStopped"
+    PubSub.publish "randomSampleGenerationStopped", {}
 
     clearInterval _id #stop the setinterval function
     _runCount = 0
@@ -359,20 +359,11 @@ socr.controller = (model, view) ->
     precision = $('#result-precision').attr('checked')
     if precision is "checked"
       precision = 3
-    #create dotplot
-    console.log "setdotplot started"
-    console.log "variable:" + $("#variable").val()
-    view.createDotplot
+    console.log "setdotplot started", "variable:" + $("#variable").val()
+    model.setInferenceSettings
       variable: $("#variable").val()
       precision: precision
       index: index
-    #setTimeout (->
-    #  PubSub.publish "Dotplot generated"
-    #  return
-    #), 500
-    PubSub.publish "toggleLoadingSpinner" ,{action:'hide'}
-
-
     return
 
   ###

src/appModel.coffee

@@ -17,7 +17,11 @@ socr.model = ->
   # Why there are keys and values? Its because in some form of data input (like coin toss), the "key" contains the symbolic meaningful reference whereas the "value" contains the mathematical equivalent value.
 
   _kvStore = {}
-
+  _inferenceSettings =
+    variable: null
+    precision: null
+    index: null
+  
   _stopCount = 1000
   _count = 0
   _n = []
@@ -920,4 +924,16 @@ socr.model = ->
     console.log "aboveThreshold : "+_sum
     return (_sum > MEM_THRESHOLD)
 
+  setInferenceSettings: (setting)->
+    if setting.variable? or setting.precision? or ( setting.index? and !isNaN(setting.index))
+      _inferenceSettings = 
+          variable: setting.variable
+          precision: setting.precision
+          index: setting.index
+      PubSub.publish "setInferenceSettingComplete", _inferenceSettings
+      return true
+    else
+      throw new Error("Incorrect arguments")
+  getInferenceSettings: ->
+    _inferenceSettings
 #return

src/appView.coffee

@@ -52,7 +52,7 @@ socr.view = (model) ->
       config.entries.push obj
       obj = {} #destroying the object
       i++
-    $.get "partials/sampleList.tmpl", (data) ->
+    $.get "dist/partials/sampleList.tmpl", (data) ->
       temp = Mustache.render(data, config)
       $("#sampleList").html temp
 
@@ -238,7 +238,6 @@ socr.view = (model) ->
       socr.view.showSampleListLoader()
       socr.view.updateStatus "started"
 
-
     PubSub.subscribe "randomSampleGenerationComplete", (msg,data)->
       #updating controller view slider
       socr.view.updateCtrlMessage "samples generated sucessfully.", "success", 2000
@@ -256,6 +255,10 @@ socr.view = (model) ->
     PubSub.subscribe "toggleLoadingSpinner" ,(msg,data)->
       socr.view.toggleLoadingSpinner(data)
 
+    PubSub.subscribe "setInferenceSettingComplete", (msg, data)=>
+      socr.view.createDotplot data
+      socr.view.updateSimulationInfo()
+    return true
   toggleControllerHandle: (action) ->
     console.log action
     $target = $("#slide-out-controller")
@@ -326,29 +329,40 @@ socr.view = (model) ->
   ###
   @method - reset()
   @description: Clears all canvas and div. Resetting the view of the whole App
-  @dependencies : none
+  @parameter scope - Array
   ###
-  reset: (option) ->
-
-    #reset only the samples in the view.
-    if option isnt "undefined" and option is "samples"
-      $("#sampleList").html ""
-    else
-
-      #$('#displayCount').html('0');  //resetting the count to 0
+  reset: (scope=["app"]) ->
+    _resetSampleScope = ->
       $("#sampleList").html "" #clear the sample List dive
       $("#showCount").html ""
       socr.view.updateSlider()
+      $(".pagination").html ""
+
+    _resetDataScope = ->
       $("#dataPlot").html "" #clear dataPlot div
       $("#dotplot").empty() #clear dotPlot div
+    _resetAccordion = ->
       $("#accordion").accordion "activate", 0
-      $(".pagination").html ""
       $("#details").html ""
-      $("#dataset").html ""
-
-      # $("#input").inputtable('clear');
-      _currentValues = []
-      $("#controller-content").html "<div class=\"alert alert-error\">From the \"data driven\" tab select an experiment  or enter data the spreadsheet first!</div>"
+    
+    scope.forEach (s)->
+      switch
+        when s is "sampleslistview" 
+          $("#sampleList").html ""
+        when s is "randomsamples"
+          _resetSampleScope()
+          _resetDataScope()
+          _resetAccordion()
+        when s is "app"
+          _resetSampleScope()
+          _resetDataScope()
+          _resetAccordion()
+          _currentValues = []
+          $("#controller-content").html "<div class=\"alert alert-error\">From the \"Input\" tab, select an experiment  or enter sample data!</div>"
+        else
+          echo "."
+      #$('#displayCount').html('0');  //resetting the count to 0
+      # $("#input").inputtable('clear');      
     return
 
 
@@ -477,7 +491,7 @@ socr.view = (model) ->
       index: _indexes
       showBack: showBack
 
-    $.get "partials/controller.tmpl", (data) ->
+    $.get "dist/partials/controller.tmpl", (data) ->
       _output = Mustache.render(data, config)
       $("#controller-content").html _output
       socr.controller.initController()
@@ -592,7 +606,7 @@ socr.view = (model) ->
   @return : {boolean}
   ###
   createDotplot: (setting) ->
-    return false  unless setting.variable?
+    throw new Error("invalid arguments: settings")  unless setting.variable?
     _currentVariable = setting.variable
     $("#accordion").accordion "activate", 2
 
@@ -759,7 +773,7 @@ socr.view = (model) ->
     #        }
     @updateCtrlMessage "Infer plot created.", "success"
     true
-
+    PubSub.publish "toggleLoadingSpinner" ,{action:'hide'}
 
   ###
   @method updateSimulationInfo
@@ -775,13 +789,13 @@ socr.view = (model) ->
       catch e
         name = "Data Driven Experiment"
     config =
+      variable: socr.model.getInferenceSettings()['variable']
       name: name
       k: socr.model.getK()
       groups: []
       results: []
       rCount: model.getRSampleCount()
 
-
     #adding results
     if config.k > 1
       if socr.model.getPof("dataset") isnt false
@@ -805,9 +819,9 @@ socr.view = (model) ->
       i++
 
     #console.log(config);
-    $.get "partials/info.tmpl", ((data) ->
-      temp = Mustache.render(data, config)
-      $("#details").html temp
+    $.get "dist/partials/info.tmpl", ((data) ->
+      htmlContent = Mustache.render(data, config)
+      $("#details").html htmlContent
       return
     ),"html"
 

src/partials/info.tmpl

@@ -5,6 +5,10 @@
             <td>Experiment Name</td>
             <td><strong>{{name}}</strong></td>
         </tr>
+        <tr>
+            <td>Inference Type</td>
+            <td><strong>{{variable}}</strong></td>
+        </tr>
         {{#results}}
         <tr>
             <td>{{param}}</td>