@pie-element/placement-ordering 7.5.3-next.452 → 7.5.3-next.467
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/configure/package.json +3 -3
- package/controller/lib/index.js +7 -1
- package/controller/lib/index.js.map +1 -1
- package/controller/lib/scoring.js +8 -1
- package/controller/lib/scoring.js.map +1 -1
- package/docs/demo/generate.js +1 -1
- package/docs/pie-schema.json +6 -6
- package/docs/pie-schema.json.md +2 -2
- package/package.json +5 -5
package/configure/package.json
CHANGED
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
"@material-ui/core": "^3.9.2",
|
|
9
9
|
"@material-ui/icons": "^3.0.1",
|
|
10
10
|
"@pie-framework/pie-configure-events": "^1.2.0",
|
|
11
|
-
"@pie-lib/config-ui": "^10.10.
|
|
12
|
-
"@pie-lib/editable-html": "^7.17.
|
|
13
|
-
"@pie-lib/scoring-config": "^3.5.
|
|
11
|
+
"@pie-lib/config-ui": "^10.10.12",
|
|
12
|
+
"@pie-lib/editable-html": "^7.17.12",
|
|
13
|
+
"@pie-lib/scoring-config": "^3.5.141",
|
|
14
14
|
"debug": "^3.1.0",
|
|
15
15
|
"lodash": "^4.17.15",
|
|
16
16
|
"nested-property": "^0.0.7",
|
package/controller/lib/index.js
CHANGED
|
@@ -101,6 +101,12 @@ function model(question, session, env) {
|
|
|
101
101
|
case 0:
|
|
102
102
|
normalizedQuestion = normalize(question);
|
|
103
103
|
base = {};
|
|
104
|
+
|
|
105
|
+
if (_lodash["default"].every(question.alternateResponses, _lodash["default"].isArray)) {
|
|
106
|
+
log('Deprecated structure of alternateResponses is in use');
|
|
107
|
+
console.error('Deprecated structure of alternateResponses is in use');
|
|
108
|
+
}
|
|
109
|
+
|
|
104
110
|
base.env = env;
|
|
105
111
|
base.outcomes = [];
|
|
106
112
|
base.completeLength = (normalizedQuestion.correctResponse || []).length;
|
|
@@ -184,7 +190,7 @@ function model(question, session, env) {
|
|
|
184
190
|
resolve(base);
|
|
185
191
|
}
|
|
186
192
|
|
|
187
|
-
case
|
|
193
|
+
case 16:
|
|
188
194
|
case "end":
|
|
189
195
|
return _context.stop();
|
|
190
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.js"],"names":["log","questionError","Error","outcome","question","session","env","Promise","resolve","reject","_","isEmpty","score","empty","correctResponse","s","finalScore","partialScoring","enabled","e","createDefaultModel","model","defaults","normalize","rationaleEnabled","feedbackEnabled","promptEnabled","teacherInstructionsEnabled","studentInstructionsEnabled","normalizedQuestion","base","outcomes","completeLength","length","choices","filter","choice","label","note","showNote","alternateResponses","mode","placementArea","value","map","m","id","prompt","config","orientation","includeTargets","choiceLabelEnabled","targetLabel","choiceLabel","showOrdering","numberedGuides","allowSameChoiceInTargets","removeTilesAfterPlacing","disabled","role","rationale","teacherInstructions","allCorrectResponses","bestSetOfResponses","reduce","info","cr","currentScore","acc","c","idx","arr","allCorrect","correct","isEqual","correctness","feedback","then","createCorrectResponseSession"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;;AAEA;;AACA;;AACA;;AACA;;AAEA;;;;;;AAEA,IAAMA,GAAG,GAAG,uBAAM,4CAAN,CAAZ;;AAEO,IAAMC,aAAa,GAAG,SAAhBA,aAAgB;AAAA,SAC3B,IAAIC,KAAJ,CAAU,qDAAV,CAD2B;AAAA,CAAtB;;;;AAGA,SAASC,OAAT,CAAiBC,QAAjB,EAA2BC,OAA3B,EAAoCC,GAApC,EAAyC;AAC9C,SAAO,IAAIC,OAAJ,CAAY,UAACC,OAAD,EAAUC,MAAV,EAAqB;AACtC,QAAI,CAACJ,OAAD,IAAYK,mBAAEC,OAAF,CAAUN,OAAV,CAAhB,EAAoC;AAClCG,MAAAA,OAAO,CAAC;AAAEI,QAAAA,KAAK,EAAE,CAAT;AAAYC,QAAAA,KAAK,EAAE;AAAnB,OAAD,CAAP;AACD;;AAED,QACE,CAACT,QAAD,IACA,CAACA,QAAQ,CAACU,eADV,IAEAJ,mBAAEC,OAAF,CAAUP,QAAQ,CAACU,eAAnB,CAHF,EAIE;AACAL,MAAAA,MAAM,CAACR,aAAa,EAAd,CAAN;AACD,KAND,MAMO;AACL,UAAI;AACF,YAAMc,CAAC,GAAG,oBAAMX,QAAN,EAAgBC,OAAhB,CAAV;AACA,YAAMW,UAAU,GAAGC,gCAAeC,OAAf,CAAuBd,QAAvB,EAAiCE,GAAG,IAAI,EAAxC,IACfS,CADe,GAEfA,CAAC,KAAK,CAAN,GACA,CADA,GAEA,CAJJ;AAKAP,QAAAA,OAAO,CAAC;AACNI,UAAAA,KAAK,EAAEI;AADD,SAAD,CAAP;AAGD,OAVD,CAUE,OAAOG,CAAP,EAAU;AACVV,QAAAA,MAAM,CAACU,CAAD,CAAN;AACD;AACF;AACF,GA1BM,CAAP;AA2BD;;AAEM,SAASC,kBAAT,GAAwC;AAAA,MAAZC,KAAY,uEAAJ,EAAI;AAC7C,SAAO,IAAId,OAAJ,CAAY,UAAAC,OAAO,EAAI;AAC5BA,IAAAA,OAAO,iCACFc,oBADE,GAEFD,KAFE,EAAP;AAID,GALM,CAAP;AAMD;;AAEM,IAAME,SAAS,GAAG,SAAZA,SAAY,CAAAnB,QAAQ;AAAA,yCAC5BkB,oBAD4B;AAE/BE,IAAAA,gBAAgB,EAAE,IAFa;AAG/BC,IAAAA,eAAe,EAAE,IAHc;AAI/BC,IAAAA,aAAa,EAAE,IAJgB;AAK/BC,IAAAA,0BAA0B,EAAE,IALG;AAM/BC,IAAAA,0BAA0B,EAAE;AANG,KAO5BxB,QAP4B;AAAA,CAA1B;AAUP;AACA;AACA;AACA;AACA;AACA;;;;;AACO,SAASiB,KAAT,CAAejB,QAAf,EAAyBC,OAAzB,EAAkCC,GAAlC,EAAuC;AAC5C,SAAO,IAAIC,OAAJ;AAAA,6FAAY,iBAAMC,OAAN;AAAA;AAAA;AAAA;AAAA;AAAA;AACXqB,cAAAA,kBADW,GACUN,SAAS,CAACnB,QAAD,CADnB;AAEX0B,cAAAA,IAFW,GAEJ,EAFI;AAIjBA,cAAAA,IAAI,CAACxB,GAAL,GAAWA,GAAX;AACAwB,cAAAA,IAAI,CAACC,QAAL,GAAgB,EAAhB;AACAD,cAAAA,IAAI,CAACE,cAAL,GAAsB,CAACH,kBAAkB,CAACf,eAAnB,IAAsC,EAAvC,EAA2CmB,MAAjE;AACAH,cAAAA,IAAI,CAACI,OAAL,GAAe,CAACL,kBAAkB,CAACK,OAAnB,IAA8B,EAA/B,EAAmCC,MAAnC,CAA0C,UAAAC,MAAM;AAAA,uBAAIA,MAAM,CAACC,KAAX;AAAA,eAAhD,CAAf;AACAP,cAAAA,IAAI,CAACQ,IAAL,GAAYT,kBAAkB,CAACS,IAA/B;AACAR,cAAAA,IAAI,CAACS,QAAL,GAAgBV,kBAAkB,CAACW,kBAAnB,IAAyCX,kBAAkB,CAACW,kBAAnB,CAAsCP,MAAtC,GAA+C,CAAxG;;AAEA,kBAAI3B,GAAG,CAACmC,IAAJ,KAAa,QAAb,IAAyB,CAACZ,kBAAkB,CAACa,aAAjD,EAAgE;AAC9DrC,gBAAAA,OAAO,CAACsC,KAAR,GAAgBb,IAAI,CAACI,OAAL,CAAaU,GAAb,CAAiB,UAAAC,CAAC;AAAA,yBAAIA,CAAC,CAACC,EAAN;AAAA,iBAAlB,CAAhB;AACD;;AAED9C,cAAAA,GAAG,CAAC,2CAAD,CAAH;AAEA8B,cAAAA,IAAI,CAACiB,MAAL,GAAclB,kBAAkB,CAACH,aAAnB,GACVG,kBAAkB,CAACkB,MADT,GAEV,IAFJ;AAGAjB,cAAAA,IAAI,CAACkB,MAAL,GAAc;AACZC,gBAAAA,WAAW,EAAEpB,kBAAkB,CAACoB,WAAnB,IAAkC,UADnC;AAEZC,gBAAAA,cAAc,EAAErB,kBAAkB,CAACa,aAFvB;AAGZS,gBAAAA,kBAAkB,EAAEtB,kBAAkB,CAACsB,kBAH3B;AAIZC,gBAAAA,WAAW,EAAEvB,kBAAkB,CAACuB,WAJpB;AAKZC,gBAAAA,WAAW,EAAExB,kBAAkB,CAACwB,WALpB;AAMZC,gBAAAA,YAAY,EAAEzB,kBAAkB,CAAC0B,cANrB;AAOZC,gBAAAA,wBAAwB,EAAE,CAAC3B,kBAAkB,CAAC4B;AAPlC,eAAd;AAUA3B,cAAAA,IAAI,CAAC4B,QAAL,GAAgBpD,GAAG,CAACmC,IAAJ,KAAa,QAA7B;;AAEA,kBACEnC,GAAG,CAACqD,IAAJ,KAAa,YAAb,KACCrD,GAAG,CAACmC,IAAJ,KAAa,MAAb,IAAuBnC,GAAG,CAACmC,IAAJ,KAAa,UADrC,CADF,EAGE;AACAX,gBAAAA,IAAI,CAAC8B,SAAL,GAAiB/B,kBAAkB,CAACL,gBAAnB,GACbK,kBAAkB,CAAC+B,SADN,GAEb,IAFJ;AAGA9B,gBAAAA,IAAI,CAAC+B,mBAAL,GAA2BhC,kBAAkB,CAACF,0BAAnB,GACvBE,kBAAkB,CAACgC,mBADI,GAEvB,IAFJ;AAGD,eAVD,MAUO;AACL/B,gBAAAA,IAAI,CAAC8B,SAAL,GAAiB,IAAjB;AACA9B,gBAAAA,IAAI,CAAC+B,mBAAL,GAA2B,IAA3B;AACD;;AAED,kBAAIvD,GAAG,CAACmC,IAAJ,KAAa,UAAb,IAA2BZ,kBAAkB,CAACJ,eAAlD,EAAmE;AAC3DkB,gBAAAA,KAD2D,GAClDtC,OAAO,IAAIA,OAAO,CAACsC,KAApB,IAA8B,EADqB;AAE3DmB,gBAAAA,mBAF2D,GAErC,qCAAuBjC,kBAAvB,CAFqC;AAI3DkC,gBAAAA,kBAJ2D,GAItCD,mBAAmB,CAACE,MAApB,CACzB,UAACC,IAAD,EAAOC,EAAP,EAAc;AACZ,sBAAMC,YAAY,GAAGzD,mBAAEsD,MAAF,CACnBrB,KADmB,EAEnB,UAACyB,GAAD,EAAMC,CAAN,EAASC,GAAT;AAAA,2BAAiBF,GAAG,IAAIF,EAAE,CAACI,GAAD,CAAF,KAAYD,CAAZ,GAAgB,CAAhB,GAAoB,CAAxB,CAApB;AAAA,mBAFmB,EAGnB,CAHmB,CAArB;;AAMA,sBAAIF,YAAY,GAAGF,IAAI,CAACrD,KAAxB,EAA+B;AAC7B,2BAAO;AACL2D,sBAAAA,GAAG,EAAEL,EADA;AAELtD,sBAAAA,KAAK,EAAEuD;AAFF,qBAAP;AAID;;AAED,yBAAOF,IAAP;AACD,iBAhBwB,EAiBzB;AAAEM,kBAAAA,GAAG,EAAE,EAAP;AAAW3D,kBAAAA,KAAK,EAAE;AAAlB,iBAjByB,CAJsC;AAwBjEkB,gBAAAA,IAAI,CAACC,QAAL,GAAgBrB,mBAAEkC,GAAF,CAAMD,KAAN,EAAa,UAAS0B,CAAT,EAAYC,GAAZ,EAAiB;AAC5C,yBAAO;AACLxB,oBAAAA,EAAE,EAAEuB,CADC;AAELlE,oBAAAA,OAAO,EAAE4D,kBAAkB,CAACQ,GAAnB,CAAuBD,GAAvB,MAAgCD,CAAhC,GAAoC,SAApC,GAAgD;AAFpD,mBAAP;AAID,iBALe,CAAhB;AAOMG,gBAAAA,UA/B2D,GA+B9CV,mBAAmB,CAACE,MAApB,CAA2B,UAACS,OAAD,EAAUP,EAAV,EAAiB;AAC7D,sBAAIxD,mBAAEgE,OAAF,CAAUR,EAAV,EAAcvB,KAAd,CAAJ,EAA0B;AACxB,2BAAO,IAAP;AACD;;AAED,yBAAO8B,OAAP;AACD,iBANkB,EAMhB,KANgB,CA/B8C;AAuCjE3C,gBAAAA,IAAI,CAAC6C,WAAL,GAAmBH,UAAU,GAAG,SAAH,GAAe,WAA5C;;AAEA,oBAAI,CAACA,UAAL,EAAiB;AACf1C,kBAAAA,IAAI,CAAChB,eAAL,GAAuB,6BAAee,kBAAf,CAAvB;AACD;;AAED,yDACEC,IAAI,CAAC6C,WADP,EAEE9C,kBAAkB,CAAC+C,QAFrB,EAGEC,IAHF,CAGO,UAAAD,QAAQ,EAAI;AACjB9C,kBAAAA,IAAI,CAAC8C,QAAL,GAAgBA,QAAhB;AACApE,kBAAAA,OAAO,CAACsB,IAAD,CAAP;AACD,iBAND;AAOD,eApDD,MAoDO;AACLtB,gBAAAA,OAAO,CAACsB,IAAD,CAAP;AACD;;AArGgB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,KAAZ;;AAAA;AAAA;AAAA;AAAA,MAAP;AAuGD;;AAEM,IAAMgD,4BAA4B,GAAG,SAA/BA,4BAA+B,CAAC1E,QAAD,EAAWE,GAAX,EAAmB;AAC7D,SAAO,IAAIC,OAAJ,CAAY,UAAAC,OAAO,EAAI;AAC5B,QAAIF,GAAG,CAACmC,IAAJ,KAAa,UAAb,IAA2BnC,GAAG,CAACqD,IAAJ,KAAa,YAA5C,EAA0D;AACxDnD,MAAAA,OAAO,CAAC;AACNsC,QAAAA,EAAE,EAAE,GADE;AAENH,QAAAA,KAAK,EAAE,6BAAevC,QAAf;AAFD,OAAD,CAAP;AAID,KALD,MAKO;AACLI,MAAAA,OAAO,CAAC,IAAD,CAAP;AACD;AACF,GATM,CAAP;AAUD,CAXM","sourcesContent":["import { flattenCorrect, getAllCorrectResponses, score } from './scoring';\n\nimport _ from 'lodash';\nimport { getFeedbackForCorrectness } from '@pie-lib/feedback';\nimport { partialScoring } from '@pie-lib/controller-utils';\nimport debug from 'debug';\n\nimport defaults from './defaults';\n\nconst log = debug('@pie-element:placement-ordering:controller');\n\nexport const questionError = () =>\n new Error('Question is missing required array: correctResponse');\n\nexport function outcome(question, session, env) {\n return new Promise((resolve, reject) => {\n if (!session || _.isEmpty(session)) {\n resolve({ score: 0, empty: true });\n }\n\n if (\n !question ||\n !question.correctResponse ||\n _.isEmpty(question.correctResponse)\n ) {\n reject(questionError());\n } else {\n try {\n const s = score(question, session);\n const finalScore = partialScoring.enabled(question, env || {})\n ? s\n : s === 1\n ? 1\n : 0;\n resolve({\n score: finalScore\n });\n } catch (e) {\n reject(e);\n }\n }\n });\n}\n\nexport function createDefaultModel(model = {}) {\n return new Promise(resolve => {\n resolve({\n ...defaults,\n ...model\n });\n });\n}\n\nexport const normalize = question => ({\n ...defaults,\n rationaleEnabled: true,\n feedbackEnabled: true,\n promptEnabled: true,\n teacherInstructionsEnabled: true,\n studentInstructionsEnabled: true,\n ...question\n});\n\n/**\n *\n * @param {*} question\n * @param {*} session\n * @param {*} env\n */\nexport function model(question, session, env) {\n return new Promise(async resolve => {\n const normalizedQuestion = normalize(question);\n const base = {};\n\n base.env = env;\n base.outcomes = [];\n base.completeLength = (normalizedQuestion.correctResponse || []).length;\n base.choices = (normalizedQuestion.choices || []).filter(choice => choice.label);\n base.note = normalizedQuestion.note;\n base.showNote = normalizedQuestion.alternateResponses && normalizedQuestion.alternateResponses.length > 0;\n\n if (env.mode === 'gather' && !normalizedQuestion.placementArea) {\n session.value = base.choices.map(m => m.id);\n }\n\n log('[model] removing tileSize for the moment.');\n\n base.prompt = normalizedQuestion.promptEnabled\n ? normalizedQuestion.prompt\n : null;\n base.config = {\n orientation: normalizedQuestion.orientation || 'vertical',\n includeTargets: normalizedQuestion.placementArea,\n choiceLabelEnabled: normalizedQuestion.choiceLabelEnabled,\n targetLabel: normalizedQuestion.targetLabel,\n choiceLabel: normalizedQuestion.choiceLabel,\n showOrdering: normalizedQuestion.numberedGuides,\n allowSameChoiceInTargets: !normalizedQuestion.removeTilesAfterPlacing\n };\n\n base.disabled = env.mode !== 'gather';\n\n if (\n env.role === 'instructor' &&\n (env.mode === 'view' || env.mode === 'evaluate')\n ) {\n base.rationale = normalizedQuestion.rationaleEnabled\n ? normalizedQuestion.rationale\n : null;\n base.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled\n ? normalizedQuestion.teacherInstructions\n : null;\n } else {\n base.rationale = null;\n base.teacherInstructions = null;\n }\n\n if (env.mode === 'evaluate' && normalizedQuestion.feedbackEnabled) {\n const value = (session && session.value) || [];\n const allCorrectResponses = getAllCorrectResponses(normalizedQuestion);\n\n const bestSetOfResponses = allCorrectResponses.reduce(\n (info, cr) => {\n const currentScore = _.reduce(\n value,\n (acc, c, idx) => acc + (cr[idx] === c ? 1 : 0),\n 0\n );\n\n if (currentScore > info.score) {\n return {\n arr: cr,\n score: currentScore\n };\n }\n\n return info;\n },\n { arr: [], score: 0 }\n );\n\n base.outcomes = _.map(value, function(c, idx) {\n return {\n id: c,\n outcome: bestSetOfResponses.arr[idx] === c ? 'correct' : 'incorrect'\n };\n });\n\n const allCorrect = allCorrectResponses.reduce((correct, cr) => {\n if (_.isEqual(cr, value)) {\n return true;\n }\n\n return correct;\n }, false);\n\n base.correctness = allCorrect ? 'correct' : 'incorrect';\n\n if (!allCorrect) {\n base.correctResponse = flattenCorrect(normalizedQuestion);\n }\n\n getFeedbackForCorrectness(\n base.correctness,\n normalizedQuestion.feedback\n ).then(feedback => {\n base.feedback = feedback;\n resolve(base);\n });\n } else {\n resolve(base);\n }\n });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n return new Promise(resolve => {\n if (env.mode !== 'evaluate' && env.role === 'instructor') {\n resolve({\n id: '1',\n value: flattenCorrect(question)\n });\n } else {\n resolve(null);\n }\n });\n};\n"],"file":"index.js"}
|
|
1
|
+
{"version":3,"sources":["../src/index.js"],"names":["log","questionError","Error","outcome","question","session","env","Promise","resolve","reject","_","isEmpty","score","empty","correctResponse","s","finalScore","partialScoring","enabled","e","createDefaultModel","model","defaults","normalize","rationaleEnabled","feedbackEnabled","promptEnabled","teacherInstructionsEnabled","studentInstructionsEnabled","normalizedQuestion","base","every","alternateResponses","isArray","console","error","outcomes","completeLength","length","choices","filter","choice","label","note","showNote","mode","placementArea","value","map","m","id","prompt","config","orientation","includeTargets","choiceLabelEnabled","targetLabel","choiceLabel","showOrdering","numberedGuides","allowSameChoiceInTargets","removeTilesAfterPlacing","disabled","role","rationale","teacherInstructions","allCorrectResponses","bestSetOfResponses","reduce","info","cr","currentScore","acc","c","idx","arr","allCorrect","correct","isEqual","correctness","feedback","then","createCorrectResponseSession"],"mappings":"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","sourcesContent":["import { flattenCorrect, getAllCorrectResponses, score } from './scoring';\n\nimport _ from 'lodash';\nimport { getFeedbackForCorrectness } from '@pie-lib/feedback';\nimport { partialScoring } from '@pie-lib/controller-utils';\nimport debug from 'debug';\n\nimport defaults from './defaults';\n\nconst log = debug('@pie-element:placement-ordering:controller');\n\nexport const questionError = () =>\n new Error('Question is missing required array: correctResponse');\n\nexport function outcome(question, session, env) {\n return new Promise((resolve, reject) => {\n if (!session || _.isEmpty(session)) {\n resolve({ score: 0, empty: true });\n }\n\n if (\n !question ||\n !question.correctResponse ||\n _.isEmpty(question.correctResponse)\n ) {\n reject(questionError());\n } else {\n try {\n const s = score(question, session);\n const finalScore = partialScoring.enabled(question, env || {})\n ? s\n : s === 1\n ? 1\n : 0;\n resolve({\n score: finalScore\n });\n } catch (e) {\n reject(e);\n }\n }\n });\n}\n\nexport function createDefaultModel(model = {}) {\n return new Promise(resolve => {\n resolve({\n ...defaults,\n ...model\n });\n });\n}\n\nexport const normalize = question => ({\n ...defaults,\n rationaleEnabled: true,\n feedbackEnabled: true,\n promptEnabled: true,\n teacherInstructionsEnabled: true,\n studentInstructionsEnabled: true,\n ...question\n});\n\n/**\n *\n * @param {*} question\n * @param {*} session\n * @param {*} env\n */\nexport function model(question, session, env) {\n return new Promise(async resolve => {\n const normalizedQuestion = normalize(question);\n const base = {};\n\n if (_.every(question.alternateResponses, _.isArray)) {\n log('Deprecated structure of alternateResponses is in use');\n console.error('Deprecated structure of alternateResponses is in use');\n }\n\n base.env = env;\n base.outcomes = [];\n base.completeLength = (normalizedQuestion.correctResponse || []).length;\n base.choices = (normalizedQuestion.choices || []).filter(choice => choice.label);\n base.note = normalizedQuestion.note;\n base.showNote = normalizedQuestion.alternateResponses && normalizedQuestion.alternateResponses.length > 0;\n\n if (env.mode === 'gather' && !normalizedQuestion.placementArea) {\n session.value = base.choices.map(m => m.id);\n }\n\n log('[model] removing tileSize for the moment.');\n\n base.prompt = normalizedQuestion.promptEnabled\n ? normalizedQuestion.prompt\n : null;\n base.config = {\n orientation: normalizedQuestion.orientation || 'vertical',\n includeTargets: normalizedQuestion.placementArea,\n choiceLabelEnabled: normalizedQuestion.choiceLabelEnabled,\n targetLabel: normalizedQuestion.targetLabel,\n choiceLabel: normalizedQuestion.choiceLabel,\n showOrdering: normalizedQuestion.numberedGuides,\n allowSameChoiceInTargets: !normalizedQuestion.removeTilesAfterPlacing\n };\n\n base.disabled = env.mode !== 'gather';\n\n if (\n env.role === 'instructor' &&\n (env.mode === 'view' || env.mode === 'evaluate')\n ) {\n base.rationale = normalizedQuestion.rationaleEnabled\n ? normalizedQuestion.rationale\n : null;\n base.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled\n ? normalizedQuestion.teacherInstructions\n : null;\n } else {\n base.rationale = null;\n base.teacherInstructions = null;\n }\n\n if (env.mode === 'evaluate' && normalizedQuestion.feedbackEnabled) {\n const value = (session && session.value) || [];\n const allCorrectResponses = getAllCorrectResponses(normalizedQuestion);\n\n const bestSetOfResponses = allCorrectResponses.reduce(\n (info, cr) => {\n const currentScore = _.reduce(\n value,\n (acc, c, idx) => acc + (cr[idx] === c ? 1 : 0),\n 0\n );\n\n if (currentScore > info.score) {\n return {\n arr: cr,\n score: currentScore\n };\n }\n\n return info;\n },\n { arr: [], score: 0 }\n );\n\n base.outcomes = _.map(value, function(c, idx) {\n return {\n id: c,\n outcome: bestSetOfResponses.arr[idx] === c ? 'correct' : 'incorrect'\n };\n });\n\n const allCorrect = allCorrectResponses.reduce((correct, cr) => {\n if (_.isEqual(cr, value)) {\n return true;\n }\n\n return correct;\n }, false);\n\n base.correctness = allCorrect ? 'correct' : 'incorrect';\n\n if (!allCorrect) {\n base.correctResponse = flattenCorrect(normalizedQuestion);\n }\n\n getFeedbackForCorrectness(\n base.correctness,\n normalizedQuestion.feedback\n ).then(feedback => {\n base.feedback = feedback;\n resolve(base);\n });\n } else {\n resolve(base);\n }\n });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n return new Promise(resolve => {\n if (env.mode !== 'evaluate' && env.role === 'instructor') {\n resolve({\n id: '1',\n value: flattenCorrect(question)\n });\n } else {\n resolve(null);\n }\n });\n};\n"],"file":"index.js"}
|
|
@@ -99,7 +99,14 @@ var flattenCorrect = function flattenCorrect(question) {
|
|
|
99
99
|
exports.flattenCorrect = flattenCorrect;
|
|
100
100
|
|
|
101
101
|
var getAllCorrectResponses = function getAllCorrectResponses(question) {
|
|
102
|
-
|
|
102
|
+
var alternates = (question.alternateResponses || []).map(function (alternate) {
|
|
103
|
+
if (Array.isArray(alternate)) {
|
|
104
|
+
return alternate;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
return alternate.response;
|
|
108
|
+
});
|
|
109
|
+
return [flattenCorrect(question)].concat((0, _toConsumableArray2["default"])(alternates));
|
|
103
110
|
};
|
|
104
111
|
/**
|
|
105
112
|
* Returns the score for a session. If weighted scoring is present in the correctResponse
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/scoring.js"],"names":["log","illegalArgumentError","answer","Error","pairwiseCombinationScore","correct","opts","allowDuplicates","orderMustBeComplete","_","isEqual","uniq","length","Array","isArray","correctCombo","toArray","answerCombo","diff","differenceWith","comboLengthDiff","total","actual","n","toFixed","parseFloat","flattenCorrect","question","correctResponse","map","r","id","getAllCorrectResponses","alternateResponses","score","session","value","allCorrectResponse","configure","removeTilesAfterPlacing","bestScore","forEach","cr","currentScore"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../src/scoring.js"],"names":["log","illegalArgumentError","answer","Error","pairwiseCombinationScore","correct","opts","allowDuplicates","orderMustBeComplete","_","isEqual","uniq","length","Array","isArray","correctCombo","toArray","answerCombo","diff","differenceWith","comboLengthDiff","total","actual","n","toFixed","parseFloat","flattenCorrect","question","correctResponse","map","r","id","getAllCorrectResponses","alternates","alternateResponses","alternate","response","score","session","value","allCorrectResponse","configure","removeTilesAfterPlacing","bestScore","forEach","cr","currentScore"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { combination } from 'js-combinatorics';\nimport debug from 'debug';\n\nconst log = debug('pie-elements:placement-ordering:controller');\n\nexport const illegalArgumentError = answer =>\n new Error(\n `Cant score answer: ${answer} it has duplicates and allowDuplicates is false`\n );\nexport const pairwiseCombinationScore = (correct, answer, opts) => {\n opts = { allowDuplicates: false, orderMustBeComplete: false, ...opts };\n\n if (!opts.allowDuplicates && !_.isEqual(_.uniq(correct), correct)) {\n throw illegalArgumentError(answer);\n }\n\n if (\n opts.allowDuplicates === false &&\n answer.length !== _.uniq(answer).length\n ) {\n return 0;\n }\n\n answer = opts.allowDuplicates !== false ? answer : _.uniq(answer);\n\n log('answer:', answer);\n if (!Array.isArray(correct) || correct.length === 0) {\n throw new Error('correct must be non empty an array');\n }\n\n if (correct.length === 1) {\n return _.isEqual(correct, answer) ? 1 : 0;\n }\n\n if (!Array.isArray(answer) || answer.length < 2) {\n return 0;\n }\n\n if (answer.length > correct.length) {\n return 0;\n }\n\n if (correct.length !== answer.length && opts.orderMustBeComplete) {\n return 0;\n }\n\n const correctCombo = combination(correct, 2).toArray();\n const answerCombo = combination(answer, 2).toArray();\n\n const diff = _.differenceWith(answerCombo, correctCombo, _.isEqual);\n\n const comboLengthDiff = correctCombo.length - answerCombo.length;\n\n const total = correctCombo.length;\n const actual = total - diff.length - comboLengthDiff;\n\n const n = (actual / total).toFixed(2);\n\n return parseFloat(n);\n};\n\n/**\n * Flattens the correctResponse into an array of ordered identifiers representing the\n * correct response.\n */\nexport const flattenCorrect = question =>\n question.correctResponse\n ? question.correctResponse.map(r => (r && r.id ? r.id : r))\n : [];\n\n/**\n * Returns all correct responses for this question\n * @param question - array\n */\nexport const getAllCorrectResponses = question => {\n const alternates = (question.alternateResponses || []).map(alternate => {\n if (Array.isArray(alternate)) {\n\n return alternate;\n }\n\n return alternate.response;\n });\n\n return [ flattenCorrect(question), ...alternates ];\n};\n\n/**\n * Returns the score for a session. If weighted scoring is present in the correctResponse\n * field for the question, this will be used. If partial scoring is present in the question\n * model, this will be used. Otherwise the default scoring mechanism (0 for any incorrect, 1\n * for all correct) will be used.\n */\n\nexport const score = (question, session) => {\n const { value } = session || {};\n\n if (!value) {\n return 0;\n }\n\n const allCorrectResponse = getAllCorrectResponses(question);\n const allowDuplicates =\n (question.configure && question.configure.removeTilesAfterPlacing) !== false;\n\n /**\n * We require this to be the case - locking\n */\n //const orderMustBeComplete = true;\n\n let bestScore = 0;\n\n allCorrectResponse.forEach((cr) => {\n const currentScore = pairwiseCombinationScore(cr, value, {\n allowDuplicates\n });\n\n if (currentScore >= bestScore) {\n bestScore = currentScore;\n }\n });\n\n return bestScore;\n};\n"],"file":"scoring.js"}
|
package/docs/demo/generate.js
CHANGED
package/docs/pie-schema.json
CHANGED
|
@@ -75,17 +75,17 @@
|
|
|
75
75
|
"title": "AlternateResponse",
|
|
76
76
|
"type": "object",
|
|
77
77
|
"properties": {
|
|
78
|
-
"
|
|
78
|
+
"response": {
|
|
79
79
|
"description": "Array that contains the alternate response ids",
|
|
80
80
|
"type": "array",
|
|
81
81
|
"items": {
|
|
82
82
|
"type": "string"
|
|
83
83
|
},
|
|
84
|
-
"title": "
|
|
84
|
+
"title": "response"
|
|
85
85
|
}
|
|
86
86
|
},
|
|
87
87
|
"required": [
|
|
88
|
-
"
|
|
88
|
+
"response"
|
|
89
89
|
]
|
|
90
90
|
},
|
|
91
91
|
"title": "alternateResponses"
|
|
@@ -466,17 +466,17 @@
|
|
|
466
466
|
"title": "AlternateResponse",
|
|
467
467
|
"type": "object",
|
|
468
468
|
"properties": {
|
|
469
|
-
"
|
|
469
|
+
"response": {
|
|
470
470
|
"description": "Array that contains the alternate response ids",
|
|
471
471
|
"type": "array",
|
|
472
472
|
"items": {
|
|
473
473
|
"type": "string"
|
|
474
474
|
},
|
|
475
|
-
"title": "
|
|
475
|
+
"title": "response"
|
|
476
476
|
}
|
|
477
477
|
},
|
|
478
478
|
"required": [
|
|
479
|
-
"
|
|
479
|
+
"response"
|
|
480
480
|
]
|
|
481
481
|
},
|
|
482
482
|
"ComplexFeedbackType": {
|
package/docs/pie-schema.json.md
CHANGED
|
@@ -60,7 +60,7 @@ The object is an array with all elements of the type `object`.
|
|
|
60
60
|
|
|
61
61
|
The array object has the following properties:
|
|
62
62
|
|
|
63
|
-
## `
|
|
63
|
+
## `response` (array, required)
|
|
64
64
|
|
|
65
65
|
Array that contains the alternate response ids
|
|
66
66
|
|
|
@@ -251,7 +251,7 @@ Note: weights are not configurable in the existing component so we'll ignore it
|
|
|
251
251
|
|
|
252
252
|
Properties of the `AlternateResponse` object:
|
|
253
253
|
|
|
254
|
-
### `
|
|
254
|
+
### `response` (array, required)
|
|
255
255
|
|
|
256
256
|
Array that contains the alternate response ids
|
|
257
257
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pie-element/placement-ordering",
|
|
3
|
-
"version": "7.5.3-next.
|
|
3
|
+
"version": "7.5.3-next.467+864f4b55e",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": "pie-framework/pie-elements",
|
|
6
6
|
"publishConfig": {
|
|
@@ -8,10 +8,10 @@
|
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@material-ui/core": "^3.9.2",
|
|
11
|
-
"@pie-lib/correct-answer-toggle": "^2.3.
|
|
11
|
+
"@pie-lib/correct-answer-toggle": "^2.3.32",
|
|
12
12
|
"@pie-lib/drag": "^1.1.52",
|
|
13
|
-
"@pie-lib/math-rendering": "^2.3.
|
|
14
|
-
"@pie-lib/render-ui": "^4.12.
|
|
13
|
+
"@pie-lib/math-rendering": "^2.3.12",
|
|
14
|
+
"@pie-lib/render-ui": "^4.12.3",
|
|
15
15
|
"debug": "^4.1.1",
|
|
16
16
|
"decimal.js": "^10.0.0",
|
|
17
17
|
"lodash": "^4.17.10",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
},
|
|
25
25
|
"author": "",
|
|
26
26
|
"license": "ISC",
|
|
27
|
-
"gitHead": "
|
|
27
|
+
"gitHead": "864f4b55ea71c0e0111ee29ad3b86a6140f15135",
|
|
28
28
|
"scripts": {
|
|
29
29
|
"postpublish": "../../scripts/postpublish"
|
|
30
30
|
},
|