1.1 --- a/org/adelson-notes.org	Tue Dec 31 11:29:49 2013 -0500
     1.2 +++ b/org/adelson-notes.org	Thu Jan 16 10:37:11 2014 -0500
     1.3 @@ -66,8 +66,6 @@
     1.4  
     1.5     Horn, technical report, 1970
     1.6  
     1.7 -
     1.8 -
     1.9  * Fri Oct  4 2013
    1.10  
    1.11    Student report. Talked about how you capture the appearance of a
    1.12 @@ -93,6 +91,26 @@
    1.13    objects made of different materials. The images were gathered off of
    1.14    Flikr. 
    1.15  
    1.16 -  
    1.17 +  Then she gave another talk from someone else. It's about assigning
    1.18 +  materials to objects and then rendering them. The choice of
    1.19 +  materials is determined by some sort of expert system?
    1.20  
    1.21 -  
    1.22 +  They have made a neat looking interface for human entry of texture
    1.23 +  labeling or objects in scenes. The important elements were manual
    1.24 +  labels, dynamic display of the current selection, and undo.
    1.25 +
    1.26 +  There are papers about mechanical turk engineering.
    1.27 +
    1.28 +  lol http://opensurfaces.cs.cornell.edu/
    1.29 +
    1.30 +  CUBAM is interesting 2010 "The multidimensional wisdom of crowds."
    1.31 +  "Neural Information processing systems" some sort of voting scheme.
    1.32 +
    1.33 +  The point of this is apparently to do some kitchen makeover
    1.34 +  thing. You would take a picture of your kitchen, or you would look
    1.35 +  for a kitchen that looks like yours, and then you would be able to
    1.36 +  investigate different textures for your own kitchen.
    1.37 +
    1.38 +  apparently "Label ME" has never been appropriately
    1.39 +  crowdsourced. Turns out that you get better work if you don't use
    1.40 +  idiots to do the work lol.
    1.41 \ No newline at end of file

     2.1 --- a/org/ideas.org	Tue Dec 31 11:29:49 2013 -0500
     2.2 +++ b/org/ideas.org	Thu Jan 16 10:37:11 2014 -0500
     2.3 @@ -31,6 +31,11 @@
     2.4  getting credit.
     2.5  #+end_quote
     2.6  
     2.7 +<<<<<<< local
     2.8 +- pronuncation guide :: a simple webpage where you type in a word and
     2.9 +     it returns a simpe, English sentence describing exactly how to
    2.10 +     pronounce the word. For people who don't want to learn IPA. 
    2.11 +=======
    2.12  - learning to teleport :: scifi idea, this is a story about a person
    2.13       who is struggling with his/her society's ideas about
    2.14       teleportation. It's considered a fundamental part of being a
    2.15 @@ -41,7 +46,13 @@
    2.16       eventually transcend via destructive upload. Analogies to jumping
    2.17       off a diving board into a pool (which I simply /could not do/ for
    2.18       a long time), etc.     
    2.19 +>>>>>>> other
    2.20  
    2.21 +<<<<<<< local
    2.22 +- touch vision :: inspired by GelSight, I want to reexamine cortex and
    2.23 +                  see if I could implement touch as a very low range
    2.24 +                  form of vision.
    2.25 +=======
    2.26  - bitcoins for immigrants :: A common case with Mexican immigrants
    2.27       (illegal or not) is that they want to send money they've earned
    2.28       in the US back to their families in Mexico. They currently do this
    2.29 @@ -55,7 +66,10 @@
    2.30       them. Or, perhaps some educational seminars about bitcoin might
    2.31       be in order. There's some money to be made there because there is
    2.32       great demand, and it's a good thing to boot!
    2.33 +>>>>>>> other
    2.34  
    2.35 +<<<<<<< local
    2.36 +=======
    2.37  - reverse eye-tracking :: A painting that is actually a digital screen
    2.38       with a camera. It records people's eye tracks permanently. It's
    2.39       "artistic" because paintings are normally these things that you
    2.40 @@ -143,6 +157,7 @@
    2.41  
    2.42  - aurellem shirt :: I should make an aurellem star symbol tee-shirt. 
    2.43  
    2.44 +>>>>>>> other
    2.45  - high school science :: this is a lesson in scientific ethics. The
    2.46       goal is to calculate /g/, the local gravitational
    2.47       acceleration. The students are told that the textbook says it's