[Gzz-commits] journals/plans SA_2003.rst

[Hermanni Hyytiälä]

CVSROOT:        /cvsroot/fenfire
Module name:    journals
Changes by:     Hermanni Hyytiälä <address@hidden>      03/05/13 06:40:24

Modified files:
        plans          : SA_2003.rst 

Log message:
        environment

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/journals/plans/SA_2003.rst.diff?tr1=1.84&tr2=1.85&r1=text&r2=text

Patches:
Index: journals/plans/SA_2003.rst
diff -u journals/plans/SA_2003.rst:1.84 journals/plans/SA_2003.rst:1.85
--- journals/plans/SA_2003.rst:1.84     Tue May 13 06:33:15 2003
+++ journals/plans/SA_2003.rst  Tue May 13 06:40:24 2003
@@ -495,23 +495,25 @@
 Performers of the research and resources
 ========================================
 
-- composition of the research team and its division of labour, as well
-  as possible division of the research among different sites of work
+.. - composition of the research team and its division of labour, as well
+     as possible division of the research among different sites of work
   
-    - Dr. Tuomas Lukka (Team leader, Hki/Jkl()
-    - Professor Pertti Saariluoma (Consultant, Jkl)
-    - Janne Kujala (Researcher, Jkl)
-    - Hermanni Hyytiälä (Researcher, Jkl)
-    - Marketta Niemelä (Researcher, Jkl) ?
+Research team consists of the following members:
   
-- links of the project with other research carried out by the
-  researchers on the team
+  - Dr. Tuomas Lukka (Team leader, Agora Center, Helsinki/Jyväskylä)
+  - Professor Pertti Saariluoma (Consultant, Agora Center, Jyväskylä)
+  - Janne Kujala (Researcher, Agora Center, Jyväskylä)
+  - Hermanni Hyytiälä (Researcher, Agora Center, Jyväskylä)
+  - Marketta Niemelä (Researcher, Agora Center, Jyväskylä)
   
-Our research project has close co-operation with Agora Center (University of 
Jyväskylä, 
+.. - links of the project with other research carried out by the
+     researchers on the team
+  
+Our research project has close academic co-operation with Agora Center 
(University of Jyväskylä, 
 the InBCT-project, Professor Pekka Neittaanmäki), Psyko Center (University of 
Jyväskylä, 
 Professor Lea Pulkkinen) and the department of mathematical information 
techology 
-(University of Jyväskylä, Professor Tommi Kärkkäinen). Other partners include 
TEKES
-COMAS postgradueate school.
+(University of Jyväskylä, Professor Tommi Kärkkäinen). Other partners in 
co-operation 
+include TEKES and COMAS postgraduate school.
 
   
 - other projects of the research leader and their funding (also other
@@ -522,8 +524,9 @@
 - researcher training, including arrangements for postgraduate
   instruction and supervision
   
-  Janne Kujala, COMAS (Supervisor, Dr. Tuomas Lukka)
-  Hermanni Hyytiälä, COMAS (Supervisor, Dr. Tuomas Lukka)  
+  - Janne Kujala, COMAS (Supervisor Dr. Tuomas Lukka)
+  - Marketta Niemelä, COMAS (Supervisor Professor Pertti Saariluoma)
+  - Hermanni Hyytiälä, COMAS (Supervisor Dr. Tuomas Lukka)    
   
 - Finnish and foreign co-operation within the project
 
@@ -532,11 +535,11 @@
 Research environment
 --------------------
 
-  - Regular office (University of Jyväskylä) 
-  - Equipment: desktop computers, 3D graphics cards
-  - Controller prototypes built from commodity components (a standard 
optomechanical
-    mouse and LEGO bricks)
-  - Software: free software (Linux)  
+Research team's office is located at the University of Jyväskylä. We use
+regular desktop computers with 3D graphics cards installed on them.
+For custom controllers, we use standard optomechanical mouse and 
+LEGO bricks. All software we use is a free software (e.g., Linux).
+  
   
 Research budget
 ---------------