Commit: 0ea264aff68f7ed684d29045d69242ebb498b40e - myprojects-hg-reborn (hg)

Commit MetaInfo

• Revision: 0ea264aff68f7ed684d29045d69242ebb498b40e (tree)
• Time: 2010-09-14 07:18:41
• Author: lorenzo
• Commiter: lorenzo

Log Message

I cleaned up a bit the code and removed unnecessary tests/calculations
carried out on a single tag id.

Change Summary

• modified: haskell/visibility-haskell.hs

Incremental Difference

diff -r cfc149abd38c -r 0ea264aff68f haskell/visibility-haskell.hs
--- a/haskell/visibility-haskell.hs	Mon Sep 13 15:29:04 2010 +0000
+++ b/haskell/visibility-haskell.hs	Mon Sep 13 22:18:41 2010 +0000
@@ -15,36 +15,36 @@
 
    let dat :: [[Integer]]
 
-       dat = convert txt
+       dat = convert txt  -- Now dat is a list where every element is a row of the original data table
    
-   let dat_col = transpose dat
+   let dat_col = transpose dat -- now every entry of data_col is a column of the original data table
 
    let tag_list = get_tag_list dat_col
 
    -- putStrLn "tag_list is, "
    -- print tag_list
 
-   let tag_1080_pos = get_single_tag_story dat_col 1080
+   -- let tag_1080_pos = get_single_tag_story dat_col 1080
 
    -- putStrLn "positions of tag 1080, "
    -- print tag_1080_pos
 
-   let t_1080= get_sel (dat_col!!1) tag_1080_pos
+   -- let t_1080= get_sel (dat_col!!1) tag_1080_pos
 
    -- writeFile "ini_1080.dat" t_1080
 
   
 
-   putStrLn "the times of the begin of the contacts of tag 1080 are, "
-   print (take 30 t_1080 )
+   -- putStrLn "the times of the begin of the contacts of tag 1080 are, "
+   -- print (take 30 t_1080 )
 
-   let t_1080_2 = single_tag_unique_contact_times dat_col 1080
+   -- let t_1080_2 = single_tag_unique_contact_times dat_col 1080
 
-   putStrLn "or also "
-   print (take 30 t_1080_2 )
+   -- putStrLn "or also "
+   -- print (take 30 t_1080_2 )
 
 
-   save "1080_hs.dat" t_1080
+   -- save "1080_hs.dat" t_1080
 
    -- putStrLn "nub t_1080==nub (sort t_1080) is,"
    -- print (( t_1080)==( (sort t_1080) ))
@@ -58,36 +58,36 @@
 
    -- print (unique_time_long)
 
-   let ctime = count t_1080
+   -- let ctime = count t_1080
 
    -- putStrLn "the repeated times are, "
    -- print (take 10 ctime )
 
 
-   let n_occ = count_occurrencies t_1080
+   -- let n_occ = count_occurrencies t_1080
    -- putStrLn "the occurrencies are, "
    -- print ( n_occ )
 
 
-   let times_multi_contacts = find_repeated_times n_occ t_1080
+   -- let times_multi_contacts = find_repeated_times n_occ t_1080
    
    -- putStrLn "the times at which multiple contacts are established are, "
    -- print ( times_multi_contacts )
 
    
-   let duration_times = get_single_tag_contact_durations dat_col tag_1080_pos
+   -- let duration_times = get_single_tag_contact_durations dat_col tag_1080_pos
 
-   putStrLn "contact durations are"
-   print (take 30 duration_times )
+   -- putStrLn "contact durations are"
+   -- print (take 30 duration_times )
    
-   let summed_times = sum_corresponding_unique t_1080 duration_times
+   -- let summed_times = sum_corresponding_unique t_1080 duration_times
 
-   putStrLn "the summed duration times for multiple contacts starting at the same time  are"
-   print (take 30 summed_times )
+   -- putStrLn "the summed duration times for multiple contacts starting at the same time  are"
+   -- print (take 30 summed_times )
 
-   let summed_times_2 = single_tag_unique_contact_durations dat_col 1080
-   putStrLn "or also"
-   print (take 30 summed_times_2 )
+   -- let summed_times_2 = single_tag_unique_contact_durations dat_col 1080
+   -- putStrLn "or also"
+   -- print (take 30 summed_times_2 )
 
 
    let summed_durations_long = map (single_tag_unique_contact_durations dat_col) tag_list  
@@ -113,9 +113,9 @@
 
    let data_comb = zip unique_time_long  summed_durations_long
 
-   let summed_durations_long_ordered =   genericIndex data_comb 2
+   -- let summed_durations_long_ordered =   genericIndex data_comb 2
 
-   let ms = argsort_only (unique_time_long!!1)  (summed_durations_long!!1)
+   -- let ms = argsort_only (unique_time_long!!1)  (summed_durations_long!!1)
 
 
    let summed_durations_long_ordered = map  (argsort_tuple .  genericIndex data_comb) [0,1..length(data_comb)-1]
@@ -126,8 +126,8 @@
    putStrLn "summed_durations_long_ordered is, "
    print (summed_durations_long_ordered )
    
-   putStrLn "ms is, "
-   print (ms)
+   -- putStrLn "ms is, "
+   -- print (ms)
    
 
    
@@ -251,6 +251,6 @@
 save_vector_flat filename list = writeFile filename $ unlines (map show $ concat list)
 
 
--- Now I need a function which combines several ones
 
 
+