comparison yeti/em_onecolumn.yeti @ 21:8e61ec97b34e

I think this may be the right arrangement. Print out some results.

    (pitches = vec.fromList
        (map do note:
             fold do acc instrument:
                 { w, p, s } = distributionsFor data instrument note;
                 fold do acc bin:
-                    acc + s * (vec.at w bin) * (vec.at q bin);
+                    acc + s * p * (vec.at w bin) * (vec.at q bin);
                 done acc [0..vec.length column - 1]
             done epsilon data.instruments;
         done [data.lowest .. data.highest]);
     pitches = vec.divideBy (vec.sum pitches) pitches;
 

         do instrument: vec.fromList
            (map do note:
                 if not inRange data.ranges instrument note then epsilon else
                     { w, p, s } = distributionsFor data instrument note;
                     fold do acc bin:
-                        acc + (vec.at w bin) * (vec.at q bin);
+                        acc + s * p * (vec.at w bin) * (vec.at q bin);
                     done epsilon [0..vec.length column - 1]
                 fi;
             done [data.lowest .. data.highest])
         done data.instruments;
    
     sourceDenoms = fold do acc instrument:
         vec.add [acc, sources[instrument]]
     done (vec.zeros (data.highest - data.lowest + 1)) data.instruments;
-
-        \() (plot.plot [ Caption "Source numerators for piano", Vector (sources["piano-maps-SptkBGCl"]) ]);
-
-        \() (plot.plot [ Caption "Source denominators", Vector sourceDenoms ]);
     
     sources = mapIntoHash id
         do instrument: 
             vec.divide sources[instrument] sourceDenoms;
         done (keys sources);