Skip to content

Commit

Permalink
Merge pull request #58 from SOCR/dev
Browse files Browse the repository at this point in the history
chore: Release 0.1.5-alpha.5
#SOCRFW-224
  • Loading branch information
alxndrkalinin committed Feb 25, 2016
2 parents ed63737 + fe8dec2 commit 97235e4
Show file tree
Hide file tree
Showing 13 changed files with 573 additions and 250 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Clone the repository.
$> git clone https://github.com/SOCR/SOCRAT.git

Now, lets install all the dependencies. Go into the root folder,

$> cd SOCRAT
$> npm install
$> bower install
Expand Down Expand Up @@ -72,7 +73,7 @@ Copyright and License

**The LGPL v3.0 License**

Copyright (c) 2013-2015 Statistics Online Computational Resource [(SOCR)](http://www.StatisticsResource.org)
Copyright (c) 2013-2016 Statistics Online Computational Resource [(SOCR)](http://www.StatisticsResource.org)

All SOCR programs, materials, tools and resources are developed by and freely disseminated to the entire community.
Users may revise, extend, redistribute, modify under the terms of the Lesser GNU General Public License
Expand Down
3 changes: 1 addition & 2 deletions app/app.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,9 @@ App.run([

core.register 'charts', charts
core.start 'charts'

#core.register 'importer', importer
#core.start 'importer'
core.register 'charts', charts
core.start 'charts'

# add module to the list of Tools to appear in Tools tab dropdown
tools = [
Expand Down
2 changes: 1 addition & 1 deletion app/partials/analysis-nav.jade
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ul.nav.navbar-nav
li(ng-class="getClass('/wrangleData')")
a(ng-href='#/wrangleData') Wrangle Data
li.dropdown
a(href="#", data-toggle="dropdown", role="button", aria-haspopup="true", aria-expanded="false").dropdown-toggle
a(href="", data-toggle="dropdown", role="button", aria-haspopup="true", aria-expanded="false").dropdown-toggle
| Tools  
span.caret
ul.dropdown-menu
Expand Down
7 changes: 7 additions & 0 deletions app/partials/analysis/charts/sidebar.jade
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@ div(ng-controller="sideChartsCtrl")
h4 Variables
div
p {{graphSelect.message}}
//div(ng-show=categorical).form-inline
input(ng-model="selectorCat" type="checkbox" id="categorical")
p X is a categorical variable
div.form-inline
div.form-horizontal(ng-show="graphSelect.x")
label(for = "x") Add X
select#x.form-control(ng-change="changeVar(selector1,headers,'x');" ng-model="selector1" ng-options="v as v.value for v in headers")
div.form-horizontal(ng-show="graphSelect.y")
label(for = "y") Add Y
select#y.form-control(ng-change="changeVar(selector2,headers,'y');" ng-model="selector2" ng-options="v as v.value for v in headers")
div(ng-show = "labelVar")
input(ng-model="labelCheck" type="checkbox" id = "label")
p Check if Y variable is the labels column

div.form-horizontal(ng-show="graphSelect.z")
label(for = "z") Add Radius
select#z.form-control(ng-change="changeVar(selector3,headers,'z');" ng-model="selector3" ng-options="v as v.value for v in headers")
Expand Down
24 changes: 14 additions & 10 deletions app/partials/analysis/getData/main.jade
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ div(ng-controller='getDataMainCtrl')
p.lead To perform any analysis, you need data to begin with. Choose one of the available methods
|to get the data into the web-app.

form.socrData(collapse="showState.socrData")
form.socrData(uib-collapse="showState.socrData")
legend SOCR Datasets
div.form-group
select.form-control(
ng-model="socrdataset",
ng-options="item as item.name for item in socrDatasets track by item.id")
button.btn.btn-primary(ng-click="getSocrData()") Load

div.worldBank(collapse="showState.worldBank")
div.worldBank(uib-collapse="showState.worldBank")
h3 WorldBank Data
span Size:
input(type="text",class="input-mini", ng-model="size")
Expand All @@ -21,8 +21,8 @@ div(ng-controller='getDataMainCtrl')
option(value='2.4_OOSC.RATE') Out of School Children rate
button.btn.btn-primary(ng-click="getWB()") Load

div.generate(collapse="showState.generate")
ul.nav.nav-pills.nav-stacked
div.generate(uib-collapse="showState.generate")
ul.nav.nav-pills.nav-stacked.disabled
li
a Binomial Coin Toss
li
Expand All @@ -34,10 +34,14 @@ div(ng-controller='getDataMainCtrl')
li
a The Beta Distribution Experiment

br
handsontable(purpose="json")




form.jsonUrl(uib-collapse="showState.jsonParse")
legend Enter URL to parse JSON file
div.form-group
label(for="getDataJsonUrlInput").sr-only Enter URL
div.btn-group.btn-group-justified(role="group")
input#getDataJsonUrlInput(type='text', placeholder='URL to JSON ...', ng-model="jsonUrl").form-control
span#getDataJsonUrlClear(ng-click="jsonUrl=''").glyphicon.glyphicon-remove-circle
button.btn.btn-primary(ng-click="getJsonByUrl()") Parse

br
handsontable(purpose="json")
24 changes: 15 additions & 9 deletions app/partials/analysis/getData/sidebar.jade
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,35 @@ div(ng-controller="getDataSidebarCtrl")
p. Data input
div.list-group
a#getDataGrid.list-group-item(
href="#"
href=""
ng-click="show('grid')"
ng-class="{active:selected == 'getDataGrid'}")
| Copy-paste to spreadsheet
a#getDataSocrData.list-group-item(
href="#"
href=""
ng-click="show('socrData')"
ng-class="{active:selected == 'getDataSocrData'}")
| Load SOCR dataset
a#getDataWorldBank.list-group-item(
href="#"
href=""
ng-click="show('worldBank')"
ng-class="{active:selected == 'getDataWorldBank'}")
| Load data from WorldBank
a#getDataGenerate.list-group-item.disabled(
href="#"
a#getDataGenerate.list-group-item(
href=""
ng-click="show('generate')"
ng-class="{active:selected == 'getDataGenerate'}")
| Use data generator
a.list-group-item.disabled(href="#", ng-click="getJson()", ng-class="{active:selected == 'getDataJson'}")
| Parse JSON fileParse SOCR Data page
a.list-group-item.disabled(href="#", ng-click="save()", ng-class="{active:selected == 'getDataSocrPage'}")
| Parse SOCR Data page
a#getDataJson.list-group-item(
href=""
ng-click="show('jsonParse')"
ng-class="{active:selected == 'getDataJson'}")
| Parse JSON file by URL
a#getDataSocrPage.list-group-item.disabled(
href=""
ng-click="save()"
ng-class="{active:selected == 'getDataSocrPage'}")
| Parse SOCR Data page by URL

//
accordion(close-others="true")
Expand Down
100 changes: 51 additions & 49 deletions app/partials/analysis/tools/machineLearning/kMeans/sidebar.jade
Original file line number Diff line number Diff line change
@@ -1,53 +1,55 @@
div(ng-controller="kMeansSidebarCtrl")
form
legend Parameters
div.checkbox
label
input(type="checkbox", ng-model="wholedataseton")
| Cluster whole dataset (visualize 2D projection)
div.form-group
label X column  
//- show data header column names
select(ng-model="xCol", ng-options="col for col in cols").form-control
div.form-group
label Y column  
//- show data header column names
select(ng-model="yCol", ng-options="col for col in cols").form-control
div.form-group
fieldset(ng-disabled="!labelson")
label Labels column  
fieldset(ng-disabled="kmeanson")
div.checkbox
label
input(type="checkbox", ng-model="wholedataseton")
| Cluster whole dataset (visualize 2D projection)
div.form-group
label X column  
//- show data header column names
select(ng-model="labelCol", ng-options="col for col in cols").form-control
div.checkbox
label
input(type="checkbox", ng-model="labelson")
| Labels present
div.form-group
label k  
select(ng-model="k", ng-options="k for k in ks").form-control
div.checkbox(ng-hide="!labelson")
label
input(
type="checkbox"
ng-model="accuracyon"
ng-disabled="k !== numUniqueLabels.num || labelCol !== numUniqueLabels.labelCol")
| Compute accuracy
div.form-group
label Distance  
select(ng-model="dist", ng-options="dist for dist in distances").form-control
div.form-group
label Initialization  
select(ng-model="initMethod", ng-options="init for init in inits").form-control
button.btn.btn-info(
type="submit"
aria-label="Get k value"
ng-click="detectKValue()"
ng-disabled="!labelson")
| Detect k
button.btn.btn-primary(
type="submit"
aria-label="Run k-Means"
ng-click="run()"
ng-disabled="kmeanson")
| Run 
span.glyphicon.glyphicon-refresh(aria-hidden="true", ng-class="running")
select(ng-model="xCol", ng-options="col for col in cols", ng-change="updateDataPoints()").form-control
div.form-group
label Y column  
//- show data header column names
select(ng-model="yCol", ng-options="col for col in cols", ng-change="updateDataPoints()").form-control
div.form-group
fieldset(ng-disabled="!labelson")
label Labels column  
//- show data header column names
select(ng-model="labelCol", ng-options="col for col in cols").form-control
div.checkbox
label
input(type="checkbox", ng-model="labelson")
| Labels present
div.form-group
fieldset.form-inline
label k  
select(ng-model="k", ng-options="k for k in ks").form-control
button.btn.btn-info(
type="submit"
aria-label="Get k value"
ng-click="detectKValue()"
ng-disabled="!labelson")
| Detect k
div.checkbox(ng-hide="!labelson")
label
input(
type="checkbox"
ng-model="accuracyon"
ng-disabled="k !== numUniqueLabels.num || labelCol !== numUniqueLabels.labelCol")
| Compute accuracy
div.form-group
label Distance  
select(ng-model="dist", ng-options="dist for dist in distances").form-control
div.form-group
label Initialization  
select(ng-model="initMethod", ng-options="init for init in inits").form-control
button.btn.btn-primary(
type="submit"
aria-label="Run k-Means"
ng-click="run()"
ng-disabled="kmeanson")
| Run 
span.glyphicon.glyphicon-refresh(aria-hidden="true", ng-class="running")
Loading

0 comments on commit 97235e4

Please sign in to comment.