Merge branch 'master' of github.com:tassia/AppRecommender

Tássia Camões Araújo
2 parents 28fbf48b e70ddffd
Showing 6 changed files with 70 additions and 29 deletions Show diff stats
src/data.py
src/examples/clustering.py
src/web/static/coda-slider-2.0/javascripts/jquery.coda-slider-2.0.js
src/web/static/css/survey.css
src/web/survey.py
src/web/templates/survey.html
@@ -271,11 +271,12 @@ class PopconXapianIndex(xapian.WritableDatabase):
 class KMedoidsClustering(cluster.KMeansClustering):
     def __init__(self,data,distance,max_data=100):
-        if len(data)<max_data:
-            data_sample = data
-        else:
-            data_sample = random.sample(data,max_data)
-        cluster.KMeansClustering.__init__(self, data_sample, distance)
+       # if len(data)<max_data:
+       #     data_sample = data
+       # else:
+       #     data_sample = random.sample(data,max_data)
+       # cluster.KMeansClustering.__init__(self, data_sample, distance)
+        cluster.KMeansClustering.__init__(self, data, distance)
         self.distanceMatrix = {}
         for submission in self._KMeansClustering__data:
             self.distanceMatrix[submission.user_id] = {}
@@ -332,7 +333,13 @@ class KMedoidsClustering(cluster.KMeansClustering):
         """
         Generate n clusters and return their medoids.
         """
-        medoids_distances = [self.getMedoid(cluster) for cluster in self.getclusters(n)]
+        #medoids_distances = [self.getMedoid(cluster) for cluster in self.getclusters(n)]
+        medoids_distances = []
+        for cluster in self.getclusters(n):
+            type(cluster)
+            print cluster
+            medoids_distances.append(self.getMedoid(cluster))
+            print medoids_distances
         medoids = [m[0] for m in medoids_distances]
         dispersion = sum([m[1] for m in medoids_distances])
         logging.info("Clustering completed and the following medoids were found: %s" % [c.user_id for c in medoids])
@@ -36,7 +36,7 @@ if __name__ == &#39;__main__&#39;:
         begin_time = datetime.datetime.now()
         logging.info("Clustering computation started at %s" % begin_time)
-        cl = PopconClusteredData(cfg)
+        cl = PopconXapianIndex(cfg)
         end_time = datetime.datetime.now()
         logging.info("Clustering computation completed at %s" % end_time)
@@ -99,9 +99,9 @@ $.fn.codaSlider = function(settings) {
 		$('#coda-nav-right-' + sliderCount + ' a').click(function(){
 			navClicks++;
 			if (currentPanel == panelCount) {
-				this.style.display = 'none'; // Button display none;
-				document.getElementById("controls-form").style.display = 'block'; // Show buttons controls;
-				document.getElementById("coda-slider-1").style.display = 'none'; // Description hidden;
+				$(this).hide("fast"); // Button display none;
+				$(".show-end").show("fast"); // Show buttons controls;
+				$(".hide-end").hide("fast"); // Description hidden;
 				return false;
 				offset = 0;
 				currentPanel = 1;
@@ -38,6 +38,16 @@ display: block;
 z-index: 3;
 }
+#controls-form label#tip-finish .tip {
+margin-top: -50px;
+left: 90px;
+}
+
+#controls-form label#tip-continue .tip {
+margin-top: -80px;
+right: -60px;
+}
+
 .innertube {
 margin: 30px;
 }
@@ -73,16 +83,13 @@ display: none;
 }
 .screenshot {
-float: right;
+float: left;
 margin: 5px;
 }
-.content-pkg ul { 
-list-style: none;
-}
-
 .content-pkg ul li {
 margin-bottom: 10px;
+font-size: 
 }
 .radioButton,
@@ -106,6 +113,10 @@ z-index: 2;
 cursor: pointer;
 }
+#continue-button {
+float: right;
+}
+
 .radioButton:hover,
 #next-button:hover,
 #controls-form input:hover {
@@ -128,24 +139,30 @@ width: 180px;
 float: right;
 }
-#controls-form,
 #next-button {
 text-align: center;
 position: absolute;
-top: 120px;
+top: 90px;
 right: 65px;
 width: 150px;
 height: 20px;
+float: right;
 z-index: 3;
 }
 #controls-form {
-top: 90px;
-right: 85px;
-height: auto;
+position: absolute;
+top: 390px;
+width: 600px;
+margin-right: auto;
+margin-left: auto;
+text-align: center;
+height: 20px;
+z-index: 3;
 }
+
 /*
  * Package Box
  */
@@ -79,12 +79,13 @@ class Package:
 class Request:
     def __init__(self,web_input,submissions_dir,user_id=0,pkgs_list=0):
         self.strategy = ""
+        print "Request from user",user_id
         if user_id:
             self.user_id = user_id
             self.outputdir = os.path.join(submissions_dir,user_id)
         else:
             self.outputdir = tempfile.mkdtemp(prefix='',dir=submissions_dir)
-            print "created dir %s",self.outputdir
+            print ("created dir %s" % self.outputdir)
             self.user_id = self.outputdir.lstrip(submissions_dir)
         if pkgs_list:
@@ -169,6 +170,7 @@ class Survey:
             request = Request(web_input,self.submissions_dir)
         else:
             user_id = web_input['user_id'].encode('utf8')
+            print "Continue", user_id
             with open("./submissions/%s/packages_list" % user_id) as packages_list:
                 pkgs_list = [line.strip() for line in packages_list.readlines()]
             request = Request(web_input,self.submissions_dir,user_id,pkgs_list)
@@ -181,9 +183,14 @@ class Survey:
             old_strategies = [dirs for root, dirs, files in
                               os.walk(os.path.join(self.submissions_dir,
                                                    request.user_id))]
-            print "OLD Strategies", old_strategies[0]
-            strategies = [s for s in self.strategies if s not in old_strategies[0]]
+            if old_strategies:
+                strategies = [s for s in self.strategies if s not in old_strategies[0]]
+                print "OLD Strategies", old_strategies[0]
+            else:
+                strategies = self.strategies
             print "LEFT",strategies
+            if not strategies:
+                return render.thanks(user_id)
             request.strategy = random.choice(strategies)
             print "selected",request.strategy
             self.rec.set_strategy(request.strategy)
@@ -25,18 +25,26 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda
 <h1>AppRecommender Survey</h1>
+<div class="show-end" style="display: none;">
+
+<p>
+A class <b>show-end</b> ou <b>hide-end</b> mostra um elemento ou esconde um elemento ao final do último Next.
+</p>
+
+</div>
+
+
 <form action="/save" method="post" enctype="multipart/form-data" name="surveyform">
 <input type="hidden" name="user_id" value=$request.user_id>
 <input type="hidden" name="strategy" value=$request.strategy>
-<div id="controls-form" style="display: none;"><!-- display show in the end form -->
+<div id="controls-form" style="display: none;" class="show-end"><!-- display show in the end form -->
 <label for="finish_button" id="tip-finish">
    <!--<div class="tip important">
    <p>Conclude your participation in this survey</p>
    </div>-->
    <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" />
 </label>
-<br />
 <label for="strategy_button" id="tip-continue">
    <!--<div class="tip tip">
    <p>Evaluate more suggestions </p>
@@ -45,7 +53,7 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda
 </label>
 </div><!-- id="controls-form" -->
-<div class="coda-slider-wrapper">
+<div class="coda-slider-wrapper hide-end">
 	<div class="coda-slider preload" id="coda-slider-1">
 $for pkg in pkg_details:
             <div class="panel">
@@ -79,6 +87,10 @@ $for pkg in pkg_details:
 			</div>-->
 			</label>
 			<br style="clear: both;" />
+		     	</div><!-- #panel-controls -->
+            		<div class="content-pkg">
+			   <ul>
+			    <li><b>Description</b>: 
 				<div class="screenshot">
 				<a class="link-thumb" rel="facebox" 
 				href="http://screenshots.debian.net/screenshot/$pkg['package']?.jpg" 
@@ -86,9 +98,7 @@ $for pkg in pkg_details:
 				<img src="http://screenshots.debian.net/thumbnail/$pkg['package']" 
 				alt="Screenshot $pkg['package']" /></a>
 				</div><!-- screenshot -->
-		     	</div><!-- #panel-controls -->
-            		<div class="content-pkg">
-			    <li><b>Description</b>: <br />$:pkg['long_description']</li>
+				<br />$:pkg['long_description']</li>
 			    $if pkg['homepage']:
 			        <li><b>Homepage</b>: $pkg['homepage']</li>
 			    $if pkg['task']:
	@@ -36,7 +36,7 @@ if __name__ == '__main__':		@@ -36,7 +36,7 @@ if __name__ == '__main__':
36	begin_time = datetime.datetime.now()	36	begin_time = datetime.datetime.now()
37	logging.info("Clustering computation started at %s" % begin_time)	37	logging.info("Clustering computation started at %s" % begin_time)
38		38
39	- cl = PopconClusteredData(cfg)	39	+ cl = PopconXapianIndex(cfg)
40		40
41	end_time = datetime.datetime.now()	41	end_time = datetime.datetime.now()
42	logging.info("Clustering computation completed at %s" % end_time)	42	logging.info("Clustering computation completed at %s" % end_time)