corrected clear in datasetquery and made the help a bit more verbose

nix
Pierre Alexandre Tremblay 6 years ago
parent d67b489f23
commit 744811d288

@ -33,8 +33,8 @@ FluidDataSetQuery : FluidManipulationClient {
this.prSendMsg(\or, [column, condition, value], action); this.prSendMsg(\or, [column, condition, value], action);
} }
reset{|action| clear{|action|
this.prSendMsg(\reset, [], action); this.prSendMsg(\clear, [], action);
} }
limit{|rows, action| limit{|rows, action|

@ -77,7 +77,7 @@ Maximum number of rows
ARGUMENT:: action ARGUMENT:: action
Run when done Run when done
METHOD:: reset METHOD:: clear
Clear the query, remove all columns, filters and limit. Clear the query, remove all columns, filters and limit.
ARGUMENT:: action ARGUMENT:: action
Run when done Run when done
@ -103,9 +103,9 @@ s.boot;
~dataSet= FluidDataSet(s,\help_fluid_dataset_query); ~dataSet= FluidDataSet(s,\help_fluid_dataset_query);
( (
~points = 100.collect{24.collect{100.rand}}; ~points = 100.collect{|i|5.collect{|j|j+(i/100)}};
~dataSet.clear; ~dataSet.clear;
~tmpbuf = Buffer.alloc(s,24); ~tmpbuf = Buffer.alloc(s,5);
fork{ fork{
s.sync; s.sync;
@ -117,24 +117,30 @@ fork{
} }
) )
//check the source
~dataSet.print;
// Prepare a FluidDataSetQuery object // Prepare a FluidDataSetQuery object
~query = FluidDataSetQuery.new; ~query = FluidDataSetQuery.new;
~query.reset; ~out = FluidDataSet(s,\help_fluid_dataset_query_out);
~query.addColumn(5);
~query.addRange(0,2);
~query.filter(0,"<",50); // prepare a simple query
~query.and(1,"<",50); ~query.filter(0,"<",0.04);
~query.and(2,"<",50); ~query.addColumn(2);
~query.limit(10); ~query.transform(~dataSet, ~out);
// Create an output DataSet and run the query // check the result
~out = FluidDataSet(s,\help_fluid_dataset_query_out); ~out.print;
//prepare a more complex query
~query.clear;
~query.filter(0,">",0.03);
~query.and(1,"<",1.08);
~query.or(2,">",2.98);
~query.addRange(1,2);
~query.transform(~dataSet, ~out); ~query.transform(~dataSet, ~out);
// Check the results // Check the results
~dataSet.print;
~out.print; ~out.print;
:: ::

Loading…
Cancel
Save