new changes

This commit is contained in:
computermusik 2024-07-09 16:27:58 +02:00
parent 0da6e51155
commit 1e8972f8ce
3 changed files with 998 additions and 1954 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,3 @@
{
}

View File

@ -1,10 +1,10 @@
inlets = 2
outlets = 3;
outlets = 4;
var jpieces = {};
var presets = [];
var hsspiece = {};
var outdict = new Dict;
var outdict = new Dict("HSSPieces");;
var points = [[0.5, 0.5], [1., 0.], [1., 1.], [0., 1.], [0., 0.]];
var net = new Dict;
var title;
@ -29,21 +29,39 @@ var DJsterParams = {
"tempo" : [20, 200, "log"],//
"timesig_denominator" : [1, 5, "enum"],//
"timesig_numerator" : [1, 12, "linear"],//
"tonic_pitch" : [12, 108, "linear"],//
"tonic_pitch" : [12, 108, "enum"],//
};
//
function dictionary(d)
{
net.name = d;
hsspiece[title]["networkData"] = JSON.parse(net.stringify());
outdict.parse(JSON.stringify(hsspiece));
outlet(0, "dictionary", outdict.name);
//outlet(0, "dictionary", outdict.name);
}
function readPiece(path)
{
outdict.import_json(path);
jpieces = JSON.parse(outdict.stringify());
var keys = outdict.getkeys();
for (var i = 0; i < keys.length; i++) outlet(3, keys[i]);
outlet(1, outdict.get("DefaultSetting::1::networkData");
outlet(1, predict(0.5, 0.5);
outlet(0, 0.5, 0.5;
}
function getSection(section)
{
outlet(1, outdict.get(section + "::1::networkData");
outlet(1, predict(0.5, 0.5);
outlet(0, 0.5, 0.5;
}
function writePiece()
{
var path = this.patcher.getnamed("machineLearning").subpatcher().getnamed("path").getvalueof();
net.export_json(path + "HSSPiece.json");
outdict.export_json(this.patcher.filepath + "HSSPiece.json");
}
function anything()
@ -57,7 +75,7 @@ function anything()
hsspiece[title] = {};
var slots = presets[i].get("pattrstorage::slots").getkeys();//number of slots here
post("slots", slots, "\n");
outlet(1, "clear");
outlet(1, "clear_data");
for (var j = 0; j < slots.length; j++){
hsspiece[title][j + 1] = {};
var trainingData = [];
@ -67,7 +85,6 @@ function anything()
delete data["Djster.µbus[" + p + "]::meters"];
for (var param in DJsterParams) {
var val = data["Djster.µbus[" + p + "]::" + param];
//post("params", hsspiece[title][j + 1]["Djster.µbus[" + p + "]::" + param], "\n");
switch (DJsterParams[param][2]) {
case "linear" :
trainingData.push(scale(val, DJsterParams[param][0], DJsterParams[param][1], 0., 1.));
@ -76,17 +93,19 @@ function anything()
trainingData.push(scale(val, DJsterParams[param][0], DJsterParams[param][1], 0., 1.));
break;
case "enum" :
trainingData.push(0);
trainingData.push(j/5);
break;
}
}
var val = data["hub::instrument::instrument-" + (p + 1)];
trainingData.push(0);
}
//var val = data["hub::instrument::instrument-" + (p + 1)];
trainingData.push(j/5);
var val = data["hub::src::src" + (p + 1)];
trainingData.push(scale(val[0], 0, 127, 0., 1.));
trainingData.push(scale(val[1], 0, 127, 0., 1.));
}
//post("data", JSON.stringify(data), "\n");
hsspiece[title][j + 1] = data;
outlet(1, points[j].concat(trainingData));
outlet(1, "addPat");
outlet(1, "data_point", points[j].concat(trainingData));
}
outlet(1, "train", 10000);
}
@ -95,10 +114,13 @@ function anything()
function list()
{
var vector = arrayfromargs(arguments);
var src = [];
var currentPiece = this.patcher.getnamed("currentPiece").getvalueof();
var keys = Object.keys(DJsterParams);
for (var i = 0; i < 4; i++) {
for (var j = 0; j < vector.length/4; j++) {
var k = j + i * vector.length/4;
//post("vector", j, "\n");
switch (j) {
case 3 : //log
case 17 :
@ -106,20 +128,32 @@ function list()
outlet(2, "Djster.µbus[" + i + "]::" + keys[j], val);
break;
case 13 : //enum
val = "Major";
outlet(2, "Djster.µbus[" + i + "]::" + keys[j], val);
//val = "Major";
post(vector[k], Math.floor(vector[k]/0.2 + 1), "\n");
outlet(2, "Djster.µbus[" + i + "]::" + keys[j], jpieces[currentPiece][parseInt(vector[k]/0.2 + 1)]["Djster.µbus[" + i + "]::scale"]);
break;
case 16 :
val = "2 2 2";
outlet(2, "Djster.µbus[" + i + "]::" + keys[j], val);
//val = "2 2 2";
outlet(2, "Djster.µbus[" + i + "]::" + keys[j], jpieces[currentPiece][parseInt(vector[k]/0.2 + 1)]["Djster.µbus[" + i + "]::meter"]);
break;
case 18 :
val = "4"
outlet(2, "Djster.µbus[" + i + "]::" + keys[j], val);
//val = "4"
outlet(2, "Djster.µbus[" + i + "]::" + keys[j], jpieces[currentPiece][parseInt(vector[k]/0.2 + 1)]["Djster.µbus[" + i + "]::timesig_denominator"]);
break;
case 21 :
val = "4"
outlet(2, "hub::instrument::instrument-" + (i + 1), val);
outlet(2, "hub::instrument::instrument-" + (i + 1), jpieces[currentPiece][parseInt(vector[k]/0.2 + 1)]["hub::instrument::instrument-" + (i + 1)]);
break;
case 22 :
src[0] = scale(vector[k], 0, 1, 0, 127);
break;
case 23 :
src[1] = scale(vector[k], 0, 1, 0, 127);
outlet(2, "hub::src::src" + (i + 1), src);
break;
case 1 : case 9 : case 10 : case 14 : case 15 : case 19 : case 20 :
var val = Math.round(scale(vector[k], 0, 1, DJsterParams[keys[j]][0], DJsterParams[keys[j]][1]));
outlet(2, "Djster.µbus[" + i + "]::" + keys[j], val);
break;
default : //linear
var val = scale(vector[k], 0, 1, DJsterParams[keys[j]][0], DJsterParams[keys[j]][1]);