Skip to content

Commit

Permalink
Merge pull request #59 from SOCR/dev
Browse files Browse the repository at this point in the history
chore: Release 0.1.5-alpha.6
#SOCRFW-239
  • Loading branch information
alxndrkalinin committed Mar 30, 2016
2 parents 97235e4 + 82a9509 commit bc7f048
Show file tree
Hide file tree
Showing 16 changed files with 777 additions and 455 deletions.
18 changes: 10 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ module.exports = function (grunt) {
// Time how long tasks take. Can help when optimizing build times
require('time-grunt')(grunt);

var serveStatic = require('serve-static');

// Automatically load required Grunt tasks
require('jit-grunt')(grunt, {
useminPrepare: 'grunt-usemin',
Expand Down Expand Up @@ -82,16 +84,16 @@ module.exports = function (grunt) {
open: true,
middleware: function (connect) {
return [
connect.static('.tmp'),
serveStatic('.tmp'),
connect().use(
'/bower_components',
connect.static('./bower_components')
serveStatic('./bower_components')
),
connect().use(
'/app/styles',
connect.static('./app/styles')
serveStatic('./app/styles')
),
connect.static(appConfig.app)
serveStatic(appConfig.app)
];
}
}
Expand All @@ -101,13 +103,13 @@ module.exports = function (grunt) {
port: 9001,
middleware: function (connect) {
return [
connect.static('.tmp'),
connect.static('test'),
serveStatic('.tmp'),
serveStatic('test'),
connect().use(
'/bower_components',
connect.static('./bower_components')
serveStatic('./bower_components')
),
connect.static(appConfig.app)
serveStatic(appConfig.app)
];
}
}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ A scalable and highly flexible HTML5/JS platform to build and run in-browser app
* Web site: http://socr.umich.edu
* Issue-tracking and project management: https://socredu.atlassian.net/browse/SOCRFW

[![Build Status](https://travis-ci.org/SOCRedu/SOCR-framework.svg?branch=master)](https://travis-ci.org/SOCRedu/SOCR-framework)
[![Dependency Status](https://gemnasium.com/SOCRedu/SOCR-framework.png?branch=master)](https://gemnasium.com/SOCRedu/SOCR-framework)
[![Build Status](https://travis-ci.org/SOCR/SOCRAT.svg?branch=master)](https://travis-ci.org/SOCR/SOCRAT)
[![Dependency Status](https://gemnasium.com/SOCR/SOCRAT.png?branch=master)](https://gemnasium.com/SOCR/SOCRAT)

Installation
------------
Expand Down
5 changes: 4 additions & 1 deletion app/partials/analysis/getData/main.jade
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,7 @@ div(ng-controller='getDataMainCtrl')
button.btn.btn-primary(ng-click="getJsonByUrl()") Parse

br
handsontable(purpose="json")
div.lead.bg-danger(ng-hide="dataType != DATA_TYPES.NESTED")
| Visual representation of hierarchical data currently is not available.
div(ng-class="{'vis-hidden': dataType != DATA_TYPES.FLAT}")
handsontable(purpose="json")
32 changes: 18 additions & 14 deletions app/partials/analysis/tools/machineLearning/kMeans/main.jade
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
div(ng-controller="kMeansMainCtrl")
h2 2D k-means Clustering
p.
k-means clustering aims to partition n observations into k clusters in which each observation belongs
to the cluster with the nearest mean, serving as a prototype of the cluster.
div(ng-show="showresults").kmeans-results
p.lead <strong> Average accuracy: </strong> {{avgAccuracy}}
div.table-responsive
table.table.table-bordered.table-condensed
tr
th Label
th Accuracy
tr(ng-repeat="(label, acc) in accs")
td {{label}}
td {{acc.toFixed(2)}}
app-kmeans
div.lead.bg-danger(ng-hide="dataType == DATA_TYPES.FLAT")
| 2D k-means Clustering doesn't support current dataset.
| Only "flat" data tables are supported.
div(ng-hide="dataType != DATA_TYPES.FLAT")
p.
k-means clustering aims to partition n observations into k clusters in which each observation belongs
to the cluster with the nearest mean, serving as a prototype of the cluster.
div(ng-show="showresults").kmeans-results
p.lead <strong> Average accuracy: </strong> {{avgAccuracy}}
div.table-responsive
table.table.table-bordered.table-condensed
tr
th Label
th Accuracy
tr(ng-repeat="(label, acc) in accs")
td {{label}}
td {{acc.toFixed(2)}}
app-kmeans
146 changes: 75 additions & 71 deletions app/partials/analysis/tools/psychometrics/instrPerfEval/main.jade
Original file line number Diff line number Diff line change
@@ -1,73 +1,77 @@
div(ng-controller="instrPerfEvalMainCtrl")
h2 Instrument Performance Evaluation
p.
Cronbach’s Alpha (α) is a measure of internal consistency or reliability of a psychometric instrument and measures
how well a set of items measure a single, one-dimensional latent aspect of individuals.
p.lead <strong> Cronbach's α: </strong> {{cronAlpha}}
div.table-responsive
table.table.table-bordered.table-striped
thead
tr
th Cronbach's alpha
th Internal consistency
tbody
tr.success
td <strong> α </strong> ≥ 0.9
td Excellent (High-Stakes testing)
tr.success
td 0.7 ≤ <strong> α </strong> < 0.9
td Good (Low-Stakes testing)
tr.info
td 0.6 ≤ <strong> α </strong> < 0.7
td Acceptable
tr.warning
td 0.5 ≤ <strong> α </strong> < 0.6
td Poor
tr.danger
td <strong> α </strong> < 0.5
td Unacceptable
p.
Cronbach's α coefficient is a point estimate of the reliability.
Its standard error is important to construct an interval estimation of its true value
and to obtain statistical inference about its significance.
There are parametric and non-parametric methods to estimate the variance of Cronbach's α,
and compute confidence intervals.
p <strong> Cronbach’s Alpha confidence intervals </strong>
p.bg-info ID confidence interval: {{cronAlphaIdInterval}}
p.bg-info Koning and Franses confidence interval: {{cronAlphaKfInterval}}
p.bg-info Bootstrap confidence interval: {{cronAlphaBootstrapInterval}}
p.bg-info Logit confidence interval: {{cronAlphaLogitInterval}}
p.bg-info Asymptotically distribution-free (ADF) interval: {{cronAlphaAdfInterval}}
br
p <strong> Other metrics of reliability: </strong>
p.
The Intra-class correlation coefficient (ICC) assesses the consistency, or reproducibility,
of quantitative measurements made by different observers measuring the same quantity.
Broadly speaking, the ICC is defined as the ratio of between-cluster variance to total variance.
p.bg-info Intraclass correlation coefficient (ICC): {{icc}}
p.
In Split-Half Reliability assessment, the test is split in half (e.g., odd / even) creating "equivalent forms".
The two "forms" are correlated with each other and the correlation coefficient is adjusted
to reflect the entire test length, using the Spearman-Brown Prophecy formula.
p.bg-info Split-Half Reliability coefficient: {{splitHalfCoef}}
p.
The Kuder–Richardson Formula 20 (KR-20) is a very reliable internal reliability estimate which simulates
calculating split-half reliability for every possible combination of items.
The Cronbach's α and KR-20 are similar ― KR-20 is a derivative of the Cronbach's α with the advantage that
it can handle both dichotomous and continuous variables, however, KR-20 can't be used
when multiple-choice questions involve partial credit and require systematic item-based analysis.
p.bg-info Kuder–Richardson Formula 20 (KR-20): {{kr20}}
br
p
small
p <strong> References: </strong>
p 1.&nbsp;
a(href='http://wiki.socr.umich.edu/index.php/SMHS_Cronbachs').
Scientific Methods for Health Sciences - Instrument Performance Evaluation: Cronbach's α
p.
2. TSAGRIS, MICHAIL, CONSTANTINOS C. FRANGOS, and CHRISTOS C. FRANGOS.
"Confidence intervals for Cronbach’s reliability coefficient."
p.
3. Maydeu-Olivares, Alberto, Donna L. Coffman, and Wolfgang M. Hartmann.
"Asymptotically distribution-free (ADF) interval estimation of coefficient alpha."
Psychological methods 12.2 (2007): 157.
div.lead.bg-danger(ng-hide="dataType == DATA_TYPES.FLAT")
| Instrument Performance Evaluation doesn't support current dataset.
| Only "flat" data tables are supported.
div(ng-hide="dataType != DATA_TYPES.FLAT")
p.
Cronbach’s Alpha (α) is a measure of internal consistency or reliability of a psychometric instrument and measures
how well a set of items measure a single, one-dimensional latent aspect of individuals.
p.lead <strong> Cronbach's α: </strong> {{cronAlpha}}
div.table-responsive
table.table.table-bordered.table-striped
thead
tr
th Cronbach's alpha
th Internal consistency
tbody
tr.success
td <strong> α </strong> ≥ 0.9
td Excellent (High-Stakes testing)
tr.success
td 0.7 ≤ <strong> α </strong> < 0.9
td Good (Low-Stakes testing)
tr.info
td 0.6 ≤ <strong> α </strong> < 0.7
td Acceptable
tr.warning
td 0.5 ≤ <strong> α </strong> < 0.6
td Poor
tr.danger
td <strong> α </strong> < 0.5
td Unacceptable
p.
Cronbach's α coefficient is a point estimate of the reliability.
Its standard error is important to construct an interval estimation of its true value
and to obtain statistical inference about its significance.
There are parametric and non-parametric methods to estimate the variance of Cronbach's α,
and compute confidence intervals.
p <strong> Cronbach’s Alpha confidence intervals </strong>
p.bg-info ID confidence interval: {{cronAlphaIdInterval}}
p.bg-info Koning and Franses confidence interval: {{cronAlphaKfInterval}}
p.bg-info Bootstrap confidence interval: {{cronAlphaBootstrapInterval}}
p.bg-info Logit confidence interval: {{cronAlphaLogitInterval}}
p.bg-info Asymptotically distribution-free (ADF) interval: {{cronAlphaAdfInterval}}
br
p <strong> Other metrics of reliability: </strong>
p.
The Intra-class correlation coefficient (ICC) assesses the consistency, or reproducibility,
of quantitative measurements made by different observers measuring the same quantity.
Broadly speaking, the ICC is defined as the ratio of between-cluster variance to total variance.
p.bg-info Intraclass correlation coefficient (ICC): {{icc}}
p.
In Split-Half Reliability assessment, the test is split in half (e.g., odd / even) creating "equivalent forms".
The two "forms" are correlated with each other and the correlation coefficient is adjusted
to reflect the entire test length, using the Spearman-Brown Prophecy formula.
p.bg-info Split-Half Reliability coefficient: {{splitHalfCoef}}
p.
The Kuder–Richardson Formula 20 (KR-20) is a very reliable internal reliability estimate which simulates
calculating split-half reliability for every possible combination of items.
The Cronbach's α and KR-20 are similar ― KR-20 is a derivative of the Cronbach's α with the advantage that
it can handle both dichotomous and continuous variables, however, KR-20 can't be used
when multiple-choice questions involve partial credit and require systematic item-based analysis.
p.bg-info Kuder–Richardson Formula 20 (KR-20): {{kr20}}
br
p
small
p <strong> References: </strong>
p 1.&nbsp;
a(href='http://wiki.socr.umich.edu/index.php/SMHS_Cronbachs').
Scientific Methods for Health Sciences - Instrument Performance Evaluation: Cronbach's α
p.
2. TSAGRIS, MICHAIL, CONSTANTINOS C. FRANGOS, and CHRISTOS C. FRANGOS.
"Confidence intervals for Cronbach’s reliability coefficient."
p.
3. Maydeu-Olivares, Alberto, Donna L. Coffman, and Wolfgang M. Hartmann.
"Asymptotically distribution-free (ADF) interval estimation of coefficient alpha."
Psychological methods 12.2 (2007): 157.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
div(ng-controller="instrPerfEvalSidebarCtrl")
form
fieldset
fieldset(ng-disabled="!perfeval")
legend Data parameters
label Number of columns&nbsp;
input(ng-model="nCols").input-small
Expand Down
24 changes: 14 additions & 10 deletions app/partials/analysis/wrangleData/wrangler.jade
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#dt_example(style='height: 400px')
.ui-layout-north#wranglerNorthPanel
#wranglerDashboard
.ui-layout-west#profilerWestPanel
#transformEditor.transformEditor
.ui-layout-center#profilerCenterPanel
#table
#preview
.spacer
.ui-layout-south
div
div.lead.bg-danger(ng-hide="dataType == DATA_TYPES.FLAT")
| Data Wrangler doesn't support current dataset.
| Only "flat" data tables are supported.
#dt_example(style='height: 400px', ng-hide="dataType != DATA_TYPES.FLAT", ng-cloak)
.ui-layout-north#wranglerNorthPanel
#wranglerDashboard
.ui-layout-west#profilerWestPanel
#transformEditor.transformEditor
.ui-layout-center#profilerCenterPanel
#table
#preview
.spacer
.ui-layout-south
Loading

0 comments on commit bc7f048

Please sign in to comment.