cassproject 0.5.29 → 0.5.30

package/README.md

@@ -44,6 +44,10 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
 
 # Changelog
 
+## 0.5.30
+* Optimized performance of EcFrameworkGraph
+* Library Updates
+
 ## 0.5.28
 * Bug fixes and library updates.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "0.5.29",
+	"version": "0.5.30",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -61,6 +61,7 @@
 		"papaparse": "^5.3.1",
 		"pem-jwk": "^2.0.0",
 		"promise-worker": "^2.0.1",
+		"rdf-canonize": "^3.0.0",
 		"web-worker": "^1.1.0"
 	},
 	"files": [

package/src/com/eduworks/ec/graph/EcFrameworkGraph.js

@@ -106,28 +106,44 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 	 *  @param {function()}      success Method to invoke when the operation completes successfully.
 	 *  @param {function(error)} failure Error method.
 	 */
-	processAssertionsBoolean(assertions, success, failure) {
-		return cassPromisify(
-			Promise.all(
-				assertions.map(async (assertion) => {
-					if (!this.containsVertexById(assertion.competency)) {
-						return;
-					}
-					let negative = await assertion.getNegative();
-					await this.processAssertionsBooleanPerAssertion(
-						assertion,
-						negative,
-						await this.getCompetency(assertion.competency),
-						[]
-					);
-				})
-			),
-			success,
-			failure
-		);
+	async processAssertionsBoolean(assertions, success, failure) {
+		let competencies = {};
+		await Promise.all(
+			assertions.map(async (assertion) => {
+				if (!this.containsVertexById(assertion.competency)) {
+					return;
+				}
+				let negative = await assertion.getNegative();
+				if (competencies[assertion.competency] == null)
+					competencies[assertion.competency] = {positives:[],negatives:[]};
+				if (negative) 
+					competencies[assertion.competency].negatives.push(assertion);
+				else 
+					competencies[assertion.competency].positives.push(assertion);
+			})
+		)
+		await Promise.all(
+			Object.keys(competencies).map(async (label) => {
+				let competency = await this.getCompetency(label);
+				await this.processAssertionsBooleanPerAssertion(
+					competencies[label].negatives,
+					true,
+					competency,
+					[]
+				);
+				await this.processAssertionsBooleanPerAssertion(
+					competencies[label].positives,
+					false,
+					competency,
+					[]
+				);
+			})
+		)
+		if (success != null)
+			success();
 	}
 	async processAssertionsBooleanPerAssertion(
-		assertion,
+		assertions,
 		negative,
 		competency,
 		visited
@@ -137,18 +153,19 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 		}
 		visited.push(competency);
 		if (negative) {
-			this.addToMetaStateArray(
-				this.getMetaStateCompetency(competency),
-				"negativeAssertion",
-				assertion
-			);
+			for (let assertion of assertions)
+				this.addToMetaStateArray(
+					this.getMetaStateCompetency(competency),
+					"negativeAssertion",
+					assertion
+				);
 			await Promise.all(
 				await this.getOutEdges(competency).map(async (alignment) =>
 					await this.getCompetency(alignment.target).then(async (t) =>
 						await this.processAssertionBooleanOutward(
 							alignment,
 							t,
-							assertion,
+							assertions,
 							negative,
 							visited
 						)
@@ -156,12 +173,12 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 				)
 			).then(async() =>
 				await Promise.all(
-					this.getInEdges(competency).map(async (alignment) =>
+					await this.getInEdges(competency).map(async (alignment) =>
 						await this.getCompetency(alignment.source).then(async (s) =>
 							await this.processAssertionBooleanInward(
 								alignment,
 								s,
-								assertion,
+								assertions,
 								negative,
 								visited
 							)
@@ -170,18 +187,19 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 				)
 			);
 		} else {
-			this.addToMetaStateArray(
-				this.getMetaStateCompetency(competency),
-				"positiveAssertion",
-				assertion
-			);
+			for (let assertion of assertions)
+				this.addToMetaStateArray(
+					this.getMetaStateCompetency(competency),
+					"positiveAssertion",
+					assertion
+				);
 			await Promise.all(
-				this.getInEdges(competency).map((alignment) =>
-					this.getCompetency(alignment.source).then((t) =>
-						this.processAssertionBooleanOutward(
+				await this.getInEdges(competency).map(async (alignment) =>
+					await this.getCompetency(alignment.source).then(async (t) =>
+						await this.processAssertionBooleanOutward(
 							alignment,
 							t,
-							assertion,
+							assertions,
 							negative,
 							visited
 						)
@@ -189,12 +207,12 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 				)
 			).then(async () =>
 				await Promise.all(
-					this.getOutEdges(competency).map(async (alignment) =>
+					await this.getOutEdges(competency).map(async (alignment) =>
 						await this.getCompetency(alignment.target).then(async (s) =>
 							await this.processAssertionBooleanInward(
 								alignment,
 								s,
-								assertion,
+								assertions,
 								negative,
 								visited
 							)
@@ -207,20 +225,20 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 	async processAssertionBooleanOutward(
 		alignment,
 		c,
-		assertion,
+		assertions,
 		negative,
 		visited
 	) {
 		if (alignment.relationType == Relation.NARROWS)
 			await this.processAssertionsBooleanPerAssertion(
-				assertion,
+				assertions,
 				negative,
 				c,
 				visited
 			);
 		else if (alignment.relationType == Relation.IS_EQUIVALENT_TO)
 			await this.processAssertionsBooleanPerAssertion(
-				assertion,
+				assertions,
 				negative,
 				c,
 				visited
@@ -229,20 +247,20 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 	async processAssertionBooleanInward(
 		alignment,
 		c,
-		assertion,
+		assertions,
 		negative,
 		visited
 	) {
 		if (alignment.relationType == Relation.REQUIRES)
 			await this.processAssertionsBooleanPerAssertion(
-				assertion,
+				assertions,
 				negative,
 				c,
 				visited
 			);
 		else if (alignment.relationType == Relation.IS_EQUIVALENT_TO)
 			await this.processAssertionsBooleanPerAssertion(
-				assertion,
+				assertions,
 				negative,
 				c,
 				visited

package/src/com/eduworks/ec/graph/EcFrameworkGraph.test.js

@@ -248,6 +248,7 @@ describe("EcFrameworkGraph", () => {
                 () => {}
             ).then(() => {
                 let result = [];
+                console.log(fg.getMetaStateCompetency(c));
                 result.push(fg.getMetaStateCompetency(c)["positiveAssertion"]?.length);
                 result.push(fg.getMetaStateCompetency(c)["negativeAssertion"]?.length);
                 return result;

package/src/org/cass/importer/CSVImport.js

@@ -1,3 +1,4 @@
+const EcArray = require("../../../com/eduworks/ec/array/EcArray");
 const EcObject = require("../../../com/eduworks/ec/array/EcObject");
 const EcRepository = require("../../cassproject/ebac/repository/EcRepository");
 
@@ -237,7 +238,11 @@ module.exports = class CSVImport {
 						) {
 							continue;
 						} else {
-							competency[colNames[idx]] = tabularData[i][idx];
+							if ((name === 'owner' || name === 'reader') && !EcArray.isArray(tabularData[i][idx])) {
+								competency[colNames[idx]] = [tabularData[i][idx]];
+							} else {
+								competency[colNames[idx]] = tabularData[i][idx];
+							}
 						}
 					}
 					competencies.push(competency);