changeset 4:bbebda98c679 no-matlab

removed matlab from computations

--- a/cpack/dml/lib/computations.pl	Fri Jul 13 16:42:16 2018 +0000
+++ b/cpack/dml/lib/computations.pl	Fri Jul 13 16:58:30 2018 +0000
@@ -57,7 +57,7 @@
 :- use_module(library(listutils)).
 :- use_module(library(lambda)).
 :- use_module(library(memo)).
-:- use_module(library(mlserver)).
+% :- use_module(library(mlserver)).
 :- use_module(library(sandbox)).
 :- use_module(library(backend_json)).
 :- use_module(library(real)).
@@ -254,11 +254,11 @@
 row_op(uniform_tempo_r(Meth,DT),Rows,Samples)   :- !, row_op(tempo,Rows,Tempo), uniform_sample(r,Meth,DT,Tempo,Samples).
 row_op(normalised_tempo(N),Rows,Samples)   :- !, row_op(tempo,Rows,Tempo), normalised_sample(ml,N,Tempo,Samples).
 row_op(normalised_tempo_r(N),Rows,Samples) :- !, row_op(tempo,Rows,Tempo), normalised_sample(r,N,Tempo,Samples).
-row_op(tempo_hist(DT,Map),Rows,Edges-Counts) :- !,
-   row_op(uniform_tempo(DT),Rows,_-Tempo),
-   M===Map,
-   [arr(Counts), arr(Edges)] === 
-      deal(accumhist(flatten(feval(M,Tempo)),1,cardr(M)), flatten(edges(M))).
+% row_op(tempo_hist(DT,Map),Rows,Edges-Counts) :- !,
+%   row_op(uniform_tempo(DT),Rows,_-Tempo),
+%   M===Map,
+%   [arr(Counts), arr(Edges)] === 
+%      deal(accumhist(flatten(feval(M,Tempo)),1,cardr(M)), flatten(edges(M))).
 
 row_op(tempo_hist_r(DT,Map),Rows,Edges-Counts) :- !,
    map_to_r_edges(Map,REdges),
@@ -268,16 +268,16 @@
    % memberchk(counts=Counts,Hist),
    % memberchk(breaks=Edges,Hist).
 
-row_op(freq_hist(Map1,W),Rows,Counts) :- 
-   column(transcription,freq,J),
-   (  W=none 
-   -> maplist(arg(J),Rows,Freqs), Weights=1
-   ;  column(transcription,W,I),
-      rows_cols([J,I],Rows,[Freqs,Weights])
-   ),
-   Map===Map1, % evaluate map and keep in Matlab workspace
-   X=feval(Map,12*log2(Freqs)-(12*log2(440)-69)),
-   array_list(accumhist(flatten(X),flatten(Weights),cardr(Map)),Counts).
+% row_op(freq_hist(Map1,W),Rows,Counts) :- 
+%   column(transcription,freq,J),
+%   (  W=none 
+%   -> maplist(arg(J),Rows,Freqs), Weights=1
+%   ;  column(transcription,W,I),
+%      rows_cols([J,I],Rows,[Freqs,Weights])
+%   ),
+%   Map===Map1, % evaluate map and keep in Matlab workspace
+%   X=feval(Map,12*log2(Freqs)-(12*log2(440)-69)),
+%   array_list(accumhist(flatten(X),flatten(Weights),cardr(Map)),Counts).
 
 row_op(freq_hist_r(Map1,W),Rows,Counts) :- 
    column(transcription,freq,J),
@@ -295,8 +295,8 @@
 map_edges(r,Map,Edges) :-
    map_to_r_edges(Map,Expr),
    Edges <- Expr.
-map_edges(ml,Map,Edges) :-
-   array_list(edges(Map),Edges).
+% map_edges(ml,Map,Edges) :-
+%   array_list(edges(Map),Edges).
 
 map_to_r_edges(expmap(Min,Max,N),sapply(seq(log(Min),log(Max),len=N+1),exp)).
 map_to_r_edges(binmap(Min,Max,N),seq(Min-HalfWidth,Max+HalfWidth,len=N+1)) :- HalfWidth=(Max-Min)/(2*(N-1)).
@@ -333,11 +333,12 @@
    aggregate(max(T), member(T,Times), MaxT),
    interp1(Lang,cubic,linspace(0,MaxT,N),Times,Vals,Times1,Vals1).
 
-interp1(ml,Meth,TSpec,Times,Vals,Times1,Vals1) :-
-   length(Times,N),
-   (N<4 -> Method=q(linear); Method=q(Meth)),
-   T1===flatten(TSpec),
-   [arr(Times1), arr(Vals1)]===deal(T1,interp1(Times,Vals,T1,Method)).
+% interp1(ml,Meth,TSpec,Times,Vals,Times1,Vals1) :-
+%   length(Times,N),
+%   (N<4 -> Method=q(linear); Method=q(Meth)),
+%   T1===flatten(TSpec),
+%   [arr(Times1), arr(Vals1)]===deal(T1,interp1(Times,Vals,T1,Method)).
+
 interp1(r,Meth,TSpec,Times,Vals,Times1,Vals1) :-
    ml_r(TSpec,RTSpec),
    length(Times,N),
@@ -348,7 +349,7 @@
 ml_r(X1:DX:X2, seq(X1,X2,DX)).
 ml_r(linspace(X1,X2,N), seq(X1,X2,len=N)).
 
-array_list(Array,List) :- arr(List)===flatten(Array).
+% array_list(Array,List) :- arr(List)===flatten(Array).
 
 :- meta_predicate '*'(2,2,+,-).
 *(F1,F2,X,Y) :- call(F1,X,Z), call(F2,Z,Y).
@@ -362,10 +363,10 @@
    Weight is Dur*Vel.
 
 
-tempo_curves_stats(ml,Curves, _{means:Means,std_devs:StdDevs}) :-
-   Data===arr(Curves),
-   array_list(mean(Data,2),Means),
-   array_list(std(Data,0,2),StdDevs).
+% tempo_curves_stats(ml,Curves, _{means:Means,std_devs:StdDevs}) :-
+%   Data===arr(Curves),
+%   array_list(mean(Data,2),Means),
+%   array_list(std(Data,0,2),StdDevs).
 
 tempo_curves_stats(r,Curves, _{means:Means,std_devs:Stds}) :-
    data  <- Curves,