# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1316508778 -7200
# Node ID 2f5155064032c3dd90737e0ceb1fc4c9ab55c11d
# Parent  c9d8fce0b6da715cd48a91de3dbc90cc2e5ca1f3# Parent  be788932a6a652d6983137b50c6b5cee7b03c44f
Merge with bb0bcacba584d9aded0c755c899b7e216176b0ad

diff -r c9d8fce0b6da -r 2f5155064032 web/JaneMcGonigal-gameDesign/config.php
--- a/web/JaneMcGonigal-gameDesign/config.php	Tue Sep 20 10:40:52 2011 +0200
+++ b/web/JaneMcGonigal-gameDesign/config.php	Tue Sep 20 10:52:58 2011 +0200
@@ -32,7 +32,7 @@
 	'client_visual' => 'images/big_visuel_rsln_mb.jpg', // optional - relative path
    	'head_logo' 	=> 'images/head_logo.gif', // optional - relative path
    	'slide_background' => 'images/slide4.jpg',
-   	'archive_img' 	=> "images/tail_sig_chi.jpg",
+   	'archive_img' 	=> "images/tail_jane-mcgonigal.jpg",
 	'archive_title' => "Jane Mc Gonigal",
 	'archive_description' => "par <a href=\"http://www.rslnmag.fr/\" target=\"_blank\">RSLN mag</a> a Microsoft France<br/>le vendredi 26 septembre 2011 | 09:30 - 10:30",
 		 
diff -r c9d8fce0b6da -r 2f5155064032 web/JaneMcGonigal-gameDesign/images/tail_jane-mcgonigal.jpg
Binary file web/JaneMcGonigal-gameDesign/images/tail_jane-mcgonigal.jpg has changed
diff -r c9d8fce0b6da -r 2f5155064032 web/JaneMcGonigal-gameDesign/images/tail_sig_chi.jpg
Binary file web/JaneMcGonigal-gameDesign/images/tail_sig_chi.jpg has changed
diff -r c9d8fce0b6da -r 2f5155064032 web/res/metadataplayer.polemic/src/js/polemic.js
--- a/web/res/metadataplayer.polemic/src/js/polemic.js	Tue Sep 20 10:40:52 2011 +0200
+++ b/web/res/metadataplayer.polemic/src/js/polemic.js	Tue Sep 20 10:52:58 2011 +0200
@@ -19,8 +19,9 @@
 // CHART TIMELINE / VERSION PROTOTYPE  ::
 
 	var RAWTweets;
-	var userPol   = new Array();
-	var userNoPol = new Array();
+	var userPol    = new Array();
+	var userNoPol  = new Array();
+	var userst 	   = new Array();
 	var numberOfTweet = 0;
 	var Users;
 	var TweetPolemic;
@@ -331,29 +332,6 @@
 		function numberUserUsePolemic(){
 			
 			for(var i=0; i<tweets.length; i++) {
-			/*	
-				var searchKeyValueArrayTest = searchKeyValueArray('userId',tweets[i].userId,userPol);
-					myUser = {
-							  userId: tweets[i].userId,
-							  userScreenName: tweets[i].userScreenName,
-							  
-							  };
-
-				if(searchKeyValueArrayTest==true){
-					myUser = userPol.push({
-										userId: tweets[i].userId,
-										userScreenName: tweets[i].userScreenName,
-										tweets:[]
-										});
-						if (tweets[i].qualification!=5){
-							
-						}else{
-							
-						}
-					
-				}
-				
-			*/	
 				if (tweets[i].qualification!=5){
 					var searchKeyValueArrayTest = searchKeyValueArray('userId',tweets[i].userId,userPol);
 					if(searchKeyValueArrayTest==true){
@@ -362,8 +340,6 @@
 											userScreenName: tweets[i].userScreenName,
 											tweets:[]
 											});
-						//var myUTweets = myUser.tweets = new Array();
-						//myUTweets.push(tweets[i]);
 					}
 				}else{
 					var searchKeyValueArrayTest = searchKeyValueArray('userId',tweets[i].userId,userPol);
@@ -375,16 +351,73 @@
 											});
 					}
 				}
+				
+				var searchKeyValueArrayTest = searchKeyValueArray('userId',tweets[i].userId,userst);
+				//console.log(searchKeyValueArrayTest);
+				if(searchKeyValueArrayTest==true){
+					//console.log("ici");
+					myUser = userst.push({
+										userId: tweets[i].userId,
+										userScreenName: tweets[i].userScreenName,
+										tweetsNP:[],
+										tweetsSP:[],
+										ecartNP:null,
+										ecartSP:null
+								 		});
+					if(tweets[i].qualification!=5){
+							userst[myUser-1].tweetsNP.push(tweets);
+					}else {
+							userst[myUser-1].tweetsSP.push(tweets);
+					}
+				}else{
+					if(tweets[searchKeyValueArrayTest].qualification!=5){
+						userst[searchKeyValueArrayTest].tweetsNP.push(tweets);
+					}else {
+						userst[searchKeyValueArrayTest].tweetsSP.push(tweets);
+					}	
+				}	
 			}
-			console.log("user  SP	       : "+userPol.length);
-			console.log("user  nSP  	   : "+userNoPol.length);
-			console.log("nbrTP / user SP   : "+round2Dec((numberOfTweet-qTweet_0)/userPol.length));
-			console.log("nbrT  / user nSP  : "+round2Dec((numberOfTweet-qTweet_0)/userNoPol.length));
+			
+			moyenneDeTweetsNPparUsers = (numberOfTweet-qTweet_0)/userNoPol.length
+			moyenneDeTweetsSPparUsers = (numberOfTweet-qTweet_0)/userPol.length
+			sommeDeMesCarreSP=0;
+			sommeDeMesCarreNP=0;			
+			for(var i=0; i<userst.length; i++) {
+				myEcartSP = Math.pow(userst[i].tweetsSP.length-moyenneDeTweetsSPparUsers,2);
+				userst[i].ecartSP=myEcartSP;
+				sommeDeMesCarreSP+=myEcartSP;
+				
+				myEcartNP = Math.pow(userst[i].tweetsNP.length-moyenneDeTweetsNPparUsers,2);
+				userst[i].ecartNP=myEcartNP;
+				sommeDeMesCarreNP+=myEcartNP;
+			}
+			varianceSP	= sommeDeMesCarreSP/userst.length
+			varianceNP	= sommeDeMesCarreNP/userst.length
+			
+			SommeVariances = varianceNP + varianceSP;
+			
+			EcartTypeSP = Math.sqrt(varianceSP);
+			EcartTypeNP = Math.sqrt(varianceNP);
+			
+			SommeEcart = EcartTypeSP + EcartTypeNP;
+			
+
+			
+			
+			console.log("user  SP	       	: "+userPol.length);
+			console.log("user  nSP  	   	: "+userNoPol.length);
+			console.log("nbrTP / user SP   	: "+round2Dec(moyenneDeTweetsSPparUsers));
+			console.log("nbrT  / user nSP  	: "+round2Dec(moyenneDeTweetsNPparUsers));
+			console.log("varianceSP	  	: "+round2Dec(varianceSP));
+			console.log("varianceNP	  	: "+round2Dec(varianceNP));
+			console.log("EcartTypeSP	  	: "+round2Dec(EcartTypeSP));
+			console.log("EcartTypeNP	  	: "+round2Dec(EcartTypeNP));
+			
 		}
 		function Report(){
 			console.log("_______________________________");
 			console.log("Total de tweets   	: "+numberOfTweet)
-			console.log("Total de tweets P 	: "+(numberOfTweet-qTweet_0)+" 	"+ pourcent((numberOfTweet-qTweet_0),numberOfTweet)+"%")
+			console.log("Total de tweets P 	: "+(numberOfTweet-qTweet_0)+" 	"+ pourcent((numberOfTweet-qTweet_0),numberOfTweet)+" %")
 			console.log("accord       		: "+qTweet_OK+" 	"+pourcent(qTweet_OK,numberOfTweet)+" %");
 			console.log("desaccord    		: "+qTweet_KO+" 	"+pourcent(qTweet_KO,numberOfTweet)+" %");
 			console.log("question     		: "+qTweet_Q+" 	"+pourcent(qTweet_Q,numberOfTweet)+" %");