Merge branch 'set-name-clash' of https://github.com/arclamp/upset int…

…o arclamp-set-name-clash
VCG · Jun 25, 2019 · b79c1cb · b79c1cb
2 parents 5e6fb2a + 7f3c307
commit b79c1cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dataLoading.js b/dataLoading.js
@@ -357,7 +357,7 @@ function parseDataSet(data, dataSetDescription) {
     for (var i = 0; i < rawSets.length; i++) {
         var combinedSets = Array.apply(null, new Array(rawSets.length)).map(Number.prototype.valueOf, 0);
         combinedSets[i] = 1;
-        var set = new Set(setPrefix + i, setNames[i], combinedSets, rawSets[i]);
+        var set = new USet(setPrefix + i, setNames[i], combinedSets, rawSets[i]);
         setIdToSet[setPrefix + i] = set;
         sets.push(set);
         if (i < nrDefaultSets) {

diff --git a/dataStructure.js b/dataStructure.js
@@ -142,7 +142,7 @@ function BaseSet(setID, setName, combinedSets, setData, fake) {
 BaseSet.prototype = Element;
 BaseSet.prototype.constructor = Element;
 
-function Set(setID, setName, combinedSets, itemList) {
+function USet(setID, setName, combinedSets, itemList) {
     BaseSet.call(this, setID, setName, combinedSets,[],1);
         for (var i = 0; i < itemList.length; i++) {
         if (itemList[i] !== 0) {
@@ -159,8 +159,8 @@ function Set(setID, setName, combinedSets, itemList) {
 
 }
 
-Set.prototype = BaseSet;
-Set.prototype.constructor = BaseSet;
+USet.prototype = BaseSet;
+USet.prototype.constructor = BaseSet;
 
 function SubSet(setID, setName, combinedSets, itemList, expectedProb) {
     BaseSet.call(this, setID, setName, combinedSets, itemList);
@@ -184,7 +184,7 @@ SubSet.prototype.toString = function () {
 }
 
 // Not sure how to do this properly with parameters?
-SubSet.prototype = Set;
+SubSet.prototype = USet;
 SubSet.prototype.constructor = SubSet;
 
 function Group(groupID, groupName, level) {