PTEROSOR/QUESTDB_website
10
0
Fork 0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-07-22 18:57:38 +02:00
Code Releases Activity

Faster uniq function

Browse Source
This commit is contained in:
Anthony Scemama 2020-11-19 23:12:14 +01:00
parent f694529175
commit 5d637180c7
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/dataset.html
View File

@ -112,6 +112,7 @@ draft: false
for (mol of uniq(subset.map(d => d.molecule))) {
const submol = subset.filter(d => d.molecule === mol)
const source = await submol.findAsync(async (d) => {
// const source = submol.find((d) => {
if (db.sets.get(d.set.name)[d.set.index] === "10.1021/acs.jctc.8b01205") {
return d.method.name === "CASPT2" && d.method.basis === "aug-cc-pVDZ"
} else {

18
static/js/data.js
View File

@ -279,9 +279,9 @@ class dataFileBase {
switch (trueTypeOf(file)) {
case String.name:
file = getFullDataPath(file)
const maxAge= (DebugMode.Enabled,0,600)
// const maxAge= (DebugMode.Enabled,0,600)
// var str = await getTextFromFileUrlAsync(file,{"Cache-Control":`max-age=${maxAge}`})
var str = await getTextFromFileUrl(file)
var str = await getTextFromFileUrl(file) //TODO
break;
case File.name:
var str = await getTextFromUploadedFileAsync(file)
@ -291,6 +291,20 @@ class dataFileBase {
dat.sourceFile = new websiteFile(file)
return dat
}
static load(file, kind = undefined) {
switch (trueTypeOf(file)) {
case String.name:
file = getFullDataPath(file)
var str = getTextFromFileUrl(file)
break;
case File.name:
var str = (async () => await getTextFromUploadedFileAsync(file))().then(x=>x)
break
}
var dat = this.loadString(str, kind);
dat.sourceFile = new websiteFile(file)
return dat
}
_OnReadMetaPair(key, value) {
switch (key) {
case "molecule":

2
static/js/loadAllData.js
View File

@ -4,9 +4,11 @@ async function loadAllData() {
fluo: [],
};
for (const f of getAbsFilesName()) {
// dic.abs.push(VertDataFile.load(f,VertExcitationKinds.Absorbtion))
dic.abs.push(await VertDataFile.loadAsync(f,VertExcitationKinds.Absorbtion))
}
for (const f of getFluoFilesName()) {
// dic.fluo.push(VertDataFile.load(f,VertExcitationKinds.Fluorescence))
dic.fluo.push(await VertDataFile.loadAsync(f,VertExcitationKinds.Fluorescence))
}
return dic;

15
static/js/uniq.js
View File

@ -1,8 +1,11 @@
function uniq(array)
{
return uniqueArray = array.filter((obj1,index) => {
return index === array.findIndex(obj2 => {
return JSON.stringify(obj1) === JSON.stringify(obj2);
});
});
}
if (array.length == 0) return [];
var sortedArray = array.sort().map( x => [x, JSON.stringify(x)] );
var uniqueArray = [ sortedArray[0][0] ];
for (let i=1 ; i<sortedArray.length ; i++) {
if ( sortedArray[i][1] != sortedArray[i-1][1])
uniqueArray.push(sortedArray[i][0])
}
return uniqueArray;
}