Improvements to return value handling magic

release-packaging/Classes/FluidKMeans.sc

@@ -13,11 +13,11 @@ FluidKMeans : FluidManipulationClient {
     }
 
     predictPoint { |buffer, action|
-        this.pr_sendMsg(\predictPoint,[buffer.asUGenInput],action,[numbers(FluidMessageResponse,_,1,_)]);
+        this.pr_sendMsg(\predictPoint,[buffer.asUGenInput],action,[number(FluidMessageResponse,_,_)]);
     }
 
     cols { |action|
-        this.pr_sendMsg(\cols,[],action,[numbers(FluidMessageResponse,_,1,_)]);
+        this.pr_sendMsg(\cols,[],action,[number(FluidMessageResponse,_,_)]);
     }
 
     read{ |filename,action|

release-packaging/Classes/FluidLabelSet.sc

@@ -29,7 +29,7 @@ FluidLabelSet : FluidManipulationClient {
     }
 
     cols {|action|
-        this.pr_sendMsg(\cols,[],action,[numbers(FluidMessageResponse,_,1,_)]);
+        this.pr_sendMsg(\cols,[],action,[number(FluidMessageResponse,_,_)]);
     }
 
     read{|filename,action|
@@ -41,7 +41,7 @@ FluidLabelSet : FluidManipulationClient {
     }
 
     size { |action|
-        this.pr_sendMsg(\size,[],action,[numbers(FluidMessageResponse,_,1,_)]);
+        this.pr_sendMsg(\size,[],action,[number(FluidMessageResponse,_,_)]);
     }
 
     clear { |action|

release-packaging/Classes/FluidMessageResponse.sc

@@ -9,9 +9,11 @@ FluidMessageResponse : Object
         selectors.do{ |selector|
             var newThings;
             # newThings,idx = selector.value(a, idx);
-            response = response.add(newThings);
+            response = response ++ newThings;
         };
-        ^response
+
+        if(response.size == 1,
+            {^response[0]},{^response})
     }
 
     *string{ |a, offset|
@@ -25,6 +27,10 @@ FluidMessageResponse : Object
         ^[a.copyRange(offset, offset + n),offset + n]
     }
 
+    *number{ |a,offset|
+        ^[a[offset]];
+    }
+
     *buffer{ |a,server,offset|
         server = server ? Server.default ;
         ^[Buffer.cachedBufferAt(server, a[offset]), offset + 1]

release-packaging/ignore/Examples/dataset/myfirstdataset.scd

@@ -80,7 +80,7 @@ c = Buffer.new(s)
 ~kMeans.predict(~dataset,~labels, {|x| x.postln})
 ~labels.getLabel(~audioBuffers[2].path,action:{|c| c.postln})
 Routine{
-    ~labels.size({|x|x[0][0].do {|i|
+    ~labels.size({|x|x.do {|i|
         forkIfNeeded{
             ~audioBuffers[i].path.postln;
             ~labels.getLabel(~audioBuffers[i].path,action:{|c| c.postln});

release-packaging/ignore/Examples/dataset/super-simple-1D-example.scd

@@ -44,11 +44,11 @@ Routine{
 
 ~labels = FluidLabelSet(s,\simple1label);
 
-~kmeans.predict(~ds,~labels, {|x| ("Size of each cluster" +  x[0]).postln})
+~kmeans.predict(~ds,~labels, {|x| ("Size of each cluster" +  x).postln})
 (
 Routine{
     var n;
-    ~labels.size({|x| n = x[0][0]});
+    ~labels.size({|x| n = x.asInt});
     n.asInt.do{|i|
         ~labels.getLabel(i.asString,action: {|l|("Label for" + i ++ ":" + l).postln});
     }