From 5b0771597d2fb173d35e2869c3b2de905152111e Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Wed, 15 Jul 2020 12:54:22 +0100
Subject: [PATCH] Extend the dubious benefits of generated properties to
 nonrealtime DataClients

---
 release-packaging/Classes/FluidKDTree.sc      |  2 +-
 release-packaging/Classes/FluidKMeans.sc      |  2 +-
 .../Classes/FluidKNNClassifier.sc             |  2 +-
 .../Classes/FluidKNNRegressor.sc              |  2 +-
 release-packaging/Classes/FluidMDS.sc         | 10 +++-------
 .../Classes/FluidMLPRegressor.sc              | 11 +++--------
 .../Classes/FluidManipulationClient.sc        | 18 ++++++++++++++----
 release-packaging/Classes/FluidNormalize.sc   |  2 +-
 release-packaging/Classes/FluidPCA.sc         |  2 +-
 .../Classes/FluidProviderTest.sc              | 19 +++++++++++--------
 release-packaging/Classes/FluidStandardize.sc |  2 +-
 11 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/release-packaging/Classes/FluidKDTree.sc b/release-packaging/Classes/FluidKDTree.sc
index ed0310d..5b46355 100644
--- a/release-packaging/Classes/FluidKDTree.sc
+++ b/release-packaging/Classes/FluidKDTree.sc
@@ -1,4 +1,4 @@
-FluidKDTree : FluidDataClient {
+FluidKDTree : FluidRTDataClient {
 
 	*new {|server,numNeighbours = 1,lookupDataSet = ""|
 		var env;
diff --git a/release-packaging/Classes/FluidKMeans.sc b/release-packaging/Classes/FluidKMeans.sc
index 1cde6e0..fba3e2d 100644
--- a/release-packaging/Classes/FluidKMeans.sc
+++ b/release-packaging/Classes/FluidKMeans.sc
@@ -1,4 +1,4 @@
-FluidKMeans : FluidDataClient {
+FluidKMeans : FluidRTDataClient {
 
 	*new {|server, numClusters = 4, maxIter = 100|
 		^super.new1(server,[\numClusters,numClusters,\maxIter,maxIter]);
diff --git a/release-packaging/Classes/FluidKNNClassifier.sc b/release-packaging/Classes/FluidKNNClassifier.sc
index 065b6dc..89e54d8 100644
--- a/release-packaging/Classes/FluidKNNClassifier.sc
+++ b/release-packaging/Classes/FluidKNNClassifier.sc
@@ -1,4 +1,4 @@
-FluidKNNClassifier : FluidDataClient {
+FluidKNNClassifier : FluidRTDataClient {
 
 	*new {|server, numNeighbours = 3, weight = 1|
 		^super.new1(server,[\numNeighbours,numNeighbours,\weight,weight]);
diff --git a/release-packaging/Classes/FluidKNNRegressor.sc b/release-packaging/Classes/FluidKNNRegressor.sc
index ee0fff9..befb11d 100644
--- a/release-packaging/Classes/FluidKNNRegressor.sc
+++ b/release-packaging/Classes/FluidKNNRegressor.sc
@@ -1,4 +1,4 @@
-FluidKNNRegressor : FluidDataClient {
+FluidKNNRegressor : FluidRTDataClient {
 
 	*new {|server, numNeighbours = 3, weight = 1|
 		^super.new1(server,[\numNeighbours,numNeighbours,\weight,weight]);
diff --git a/release-packaging/Classes/FluidMDS.sc b/release-packaging/Classes/FluidMDS.sc
index 1cf56aa..2dc8ac6 100644
--- a/release-packaging/Classes/FluidMDS.sc
+++ b/release-packaging/Classes/FluidMDS.sc
@@ -1,4 +1,4 @@
-FluidMDS : FluidManipulationClient {
+FluidMDS : FluidDataClient {
 	classvar < manhattan = 0;
 	classvar < euclidean = 1;
 	classvar < sqeuclidean = 2;
@@ -8,16 +8,12 @@ FluidMDS : FluidManipulationClient {
 	classvar < cosine = 5;
 
 	*new {|server,numDimensions = 2, distanceMetric = 1|
-		var uid = UniqueID.next;
-		^super.new(server,uid,*[
+		^super.new1(server,[
 			\numDimensions,numDimensions,
 			\distanceMetric, distanceMetric
-		])!?{|inst|inst.init(uid);inst}
+		])
 	}
 
-	init {|uid|
-		id = uid;
-	}
 
 	fitTransform{|sourceDataSet, destDataSet, action|
 		this.prSendMsg(\fitTransform,
diff --git a/release-packaging/Classes/FluidMLPRegressor.sc b/release-packaging/Classes/FluidMLPRegressor.sc
index afddd4c..0847caa 100644
--- a/release-packaging/Classes/FluidMLPRegressor.sc
+++ b/release-packaging/Classes/FluidMLPRegressor.sc
@@ -1,4 +1,4 @@
-FluidMLPRegressor : FluidManipulationClient {
+FluidMLPRegressor : FluidDataClient {
 
   const <identity = 0;
   const <sigmoid  =  1;
@@ -6,9 +6,8 @@ FluidMLPRegressor : FluidManipulationClient {
   const <tanh = 3;
 
 	*new {|server, hidden = #[3,3] , activation = 0, maxIter = 100, learnRate = 0.0001, momentum = 0.9, batchSize = 50, validation = 0.2|
-		var uid = UniqueID.next;
 		hidden = [hidden.size]++hidden;
-		^super.new(server,uid, *[
+		^super.new1(server,[
 			\hidden,hidden,
 			\activation,activation,
 			\maxIter, maxIter,
@@ -16,11 +15,7 @@ FluidMLPRegressor : FluidManipulationClient {
 			\momentum, momentum,
 			\batchsize,batchSize,
 			\validation,validation,
-		])!?{|inst|inst.init(uid);inst}
-	}
-
-	init {|uid|
-		id = uid;
+		])
 	}
 
 	fit{|sourceDataSet, targetDataSet, action|
diff --git a/release-packaging/Classes/FluidManipulationClient.sc b/release-packaging/Classes/FluidManipulationClient.sc
index da29517..9bc1d08 100644
--- a/release-packaging/Classes/FluidManipulationClient.sc
+++ b/release-packaging/Classes/FluidManipulationClient.sc
@@ -13,7 +13,7 @@ FluidProxyUgen : UGen {
 		.asSymbol
 		.asClass
 		.superclasses
-		.indexOf(FluidDataClient) ??{inputs= inputs ++ [Done.none,0]};
+		.indexOf(FluidRTDataClient) ??{inputs= inputs ++ [Done.none,0]};
 		rate = inputs.rate;
 	}
 
@@ -148,8 +148,7 @@ FluidDataClient : FluidManipulationClient {
 	*new1{ |server, params|
 		var uid = UniqueID.next;
 		params = params ?? {[]};
-		if(params.size > 0) {synthControls = params.unlace[0]};
-		params = params ++ [\inBus,Bus.control,\outBus,Bus.control,\inBuffer,-1,\outBuffer,-1];
+		if(params.size > 0 and: synthControls.size == 0) {synthControls = params.unlace[0]};
 		^super.new(server, uid, *params) !? { |inst| inst.init(uid, params) }
 	}
 
@@ -180,8 +179,19 @@ FluidDataClient : FluidManipulationClient {
 	updateSynthControls{
 		synth !? { synth.set(*parameters.asKeyValuePairs); };
 	}
+}
+
+FluidRTDataClient : FluidDataClient
+{
+
+	*new1{|server, params|
+		params = params ?? {[]};
+		if(params.size > 0) {synthControls = params.unlace[0]};
+		params = params ++ [\inBus,Bus.control,\outBus,Bus.control,\inBuffer,-1,\outBuffer,-1];
+		^super.new1(server,params)
+	}
 
-	makeDef{|defName,uid,args|
+	makeDef {|defName,uid,args|
 		var defControls = [\inBus, \outBus] ++ synthControls ++ [\inBuffer,\outBuffer];
 		var ugenControls = [this.class.name,"T2A.ar(In.kr(inBus))"] ++ synthControls ++ [\inBuffer,\outBuffer,uid];
 		var f = (
diff --git a/release-packaging/Classes/FluidNormalize.sc b/release-packaging/Classes/FluidNormalize.sc
index 61bf3f8..2578275 100644
--- a/release-packaging/Classes/FluidNormalize.sc
+++ b/release-packaging/Classes/FluidNormalize.sc
@@ -1,4 +1,4 @@
-FluidNormalize : FluidDataClient {
+FluidNormalize : FluidRTDataClient {
 
 	*new {|server, min = 0, max = 1|
 		^super.new1(server,[\min,min,\max,max]);
diff --git a/release-packaging/Classes/FluidPCA.sc b/release-packaging/Classes/FluidPCA.sc
index d0f312d..04e7c73 100644
--- a/release-packaging/Classes/FluidPCA.sc
+++ b/release-packaging/Classes/FluidPCA.sc
@@ -1,4 +1,4 @@
-FluidPCA : FluidDataClient {
+FluidPCA : FluidRTDataClient {
 
   *new {|server, numDimensions = 2|
 		^super.new1(server,[\numDimensions,numDimensions]);
diff --git a/release-packaging/Classes/FluidProviderTest.sc b/release-packaging/Classes/FluidProviderTest.sc
index bcc434e..02107ea 100644
--- a/release-packaging/Classes/FluidProviderTest.sc
+++ b/release-packaging/Classes/FluidProviderTest.sc
@@ -9,21 +9,24 @@ FluidProviderTest : UGen {
 
     }*/
 
-    *kr{ |name|
-        ^this.multiNew('control',name);
+    *kr{ |name,vals|
+        ^this.new1('control',name,vals);
 	}
 
-    *new1 { |rate, name|
+    *new1 { |rate, name,vals|
         var ascii = name.ascii;
-        ^super.new1(*[rate, ascii.size].addAll(ascii));
+		var args;
+		vals ?? {vals = []};
+		if(vals.isArray.not) {vals = [vals]};
+		args = ([rate, ascii.size].addAll(ascii) ++ vals.size).addAll(vals).addAll([1,1]);
+		args.postln;
+		^super.new1(*args);
     }
 
-    init { |size...chars|
-        //Send the number of inputs (size of provider string) as specialIndex,
-        //so server plugin knows what's going onnode
+/*    init { |size...chars|
         specialIndex = -1;
         inputs = [size].addAll(chars);
-    }
+    }*/
 
     addPoint{|server, nodeID, args, action|
         this.prSendMsg(server, nodeID, 'addPoint',args,action);
diff --git a/release-packaging/Classes/FluidStandardize.sc b/release-packaging/Classes/FluidStandardize.sc
index d7024f7..cc8861b 100644
--- a/release-packaging/Classes/FluidStandardize.sc
+++ b/release-packaging/Classes/FluidStandardize.sc
@@ -1,4 +1,4 @@
-FluidStandardize : FluidDataClient {
+FluidStandardize : FluidRTDataClient {
 	fit{|dataSet, action|
 		this.prSendMsg(\fit, [dataSet.asSymbol], action);
 	}