Add explicit *Query UGen classes for RT model objects

Enables use in SynthDefs
nix
Owen Green 5 years ago
parent 4da973c25b
commit 4c277baf60

@ -51,10 +51,12 @@ FluidKDTree : FluidRealTimeModel
lookupDataSet = lookupDataSet ? -1;
this.lookupDataSet_(lookupDataSet);
this.lookupDataSet.asUGenInput.postln;
^FluidProxyUgen.kr('FluidKDTree/query', K2A.ar(trig),
id, this.numNeighbours, this.radius, this.lookupDataSet.asUGenInput,
^FluidKDTreeQuery.kr(K2A.ar(trig),
this, this.numNeighbours, this.radius, this.lookupDataSet.asUGenInput,
this.prEncodeBuffer(inputBuffer),
this.prEncodeBuffer(outputBuffer));
}
}
FluidKDTreeQuery : FluidRTQuery {}

@ -60,9 +60,11 @@ FluidKMeans : FluidRealTimeModel {
}
kr{|trig, inputBuffer,outputBuffer|
^FluidProxyUgen.kr('FluidKMeans/query', K2A.ar(trig),
id, clusters, maxiter,
^FluidKMeansQuery.kr(K2A.ar(trig),
this, clusters, maxiter,
this.prEncodeBuffer(inputBuffer),
this.prEncodeBuffer(outputBuffer));
}
}
FluidKMeansQuery : FluidRTQuery {}

@ -38,10 +38,12 @@ FluidKNNClassifier : FluidRealTimeModel {
}
kr{|trig, inputBuffer,outputBuffer|
^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
id, this.numNeighbours, this.weight,
^FluidKNNClassifierQuery.kr(K2A.ar(trig),
this, this.numNeighbours, this.weight,
this.prEncodeBuffer(inputBuffer),
this.prEncodeBuffer(outputBuffer));
}
}
FluidKNNClassifierQuery : FluidRTQuery {}

@ -38,9 +38,11 @@ FluidKNNRegressor : FluidRealTimeModel {
}
kr{|trig, inputBuffer,outputBuffer|
^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
id, this.numNeighbours, this.weight,
^FluidKNNRegressorQuery.kr(K2A.ar(trig),
this, this.numNeighbours, this.weight,
this.prEncodeBuffer(inputBuffer),
this.prEncodeBuffer(outputBuffer));
}
}
FluidKNNRegressorQuery : FluidRTQuery {}

@ -75,12 +75,12 @@ FluidMLPRegressor : FluidRealTimeModel {
params = this.prGetParams.drop(-2) ++ [this.prEncodeBuffer(inputBuffer),
this.prEncodeBuffer(outputBuffer)];
^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
id, *params);
^FluidMLPRegressorQuery.kr(K2A.ar(trig),this, *params);
}
}
FluidMLPRegressorQuery : FluidRTQuery {}
FluidMLPClassifier : FluidRealTimeModel {
@ -145,7 +145,8 @@ FluidMLPClassifier : FluidRealTimeModel {
var params = this.prGetParams.drop(-2) ++ [this.prEncodeBuffer(inputBuffer),
this.prEncodeBuffer(outputBuffer)];
^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
id, *params);
^FluidMLPClassifierQuery.kr(K2A.ar(trig),this, *params);
}
}
FluidMLPClassifierQuery : FluidRTQuery {}

@ -60,9 +60,11 @@ FluidNormalize : FluidRealTimeModel {
this.min_(min).max_(max).invert_(invert);
^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
id, this.min, this.max, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
^FluidNormalizeQuery.kr( K2A.ar(trig),
this, this.min, this.max, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
}
}
FluidNormalizeQuery : FluidRTQuery {}

@ -55,8 +55,9 @@ FluidPCA : FluidRealTimeModel{
numDimensions = numDimensions ? this.numDimensions;
this.numDimensions_(numDimensions);
^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
id, this.numDimensions, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
^FluidPCAQuery.kr(K2A.ar(trig),this, this.numDimensions, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
}
}
FluidPCAQuery : FluidRTQuery {}

@ -60,9 +60,10 @@ FluidRobustScale : FluidRealTimeModel {
this.low_(low).high_(high).invert_(invert);
^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
id, this.low, this.high, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
^FluidRobustScaleQuery.kr(K2A.ar(trig),this, this.low, this.high, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
}
}
FluidRobustScaleQuery : FluidRTQuery {}

@ -308,3 +308,10 @@ FluidRealTimeModel : FluidModelObject
^super.new(server,params++[-1,-1]);
}
}
FluidRTQuery : FluidProxyUgen
{
*kr{ |trig, obj, args|
^super.kr(this.name,trig, obj.asUGenInput, *args)
}
}

@ -52,7 +52,8 @@ FluidStandardize : FluidRealTimeModel {
invert = invert ? this.invert;
this.invert_(invert);
^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
id, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
^FluidStandardizeQuery.kr(K2A.ar(trig),this, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
}
}
FluidStandardizeQuery : FluidRTQuery {}

@ -68,8 +68,8 @@ FluidUMAP : FluidRealTimeModel {
numDimensions = numDimensions ? this.numDimensions;
this.numDimensions_(numDimensions);
^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
id,
^FluidUMAPQuery.kr(K2A.ar(trig),
this,
this.numDimensions,
this.numNeighbours,
this.minDist,
@ -83,3 +83,5 @@ FluidUMAP : FluidRealTimeModel {
cols {|action|}
size { |action|}
}
FluidUMAPQuery : FluidRTQuery {}

Loading…
Cancel
Save