Merge branch 'master' into feature/remove_jetbrain_files

lexos/processors/analyze/KMeans.py

@@ -407,14 +407,14 @@ def get_k_means_voronoi(
     trans_x = abs(min(xs)) + 100
     trans_y = abs(min(ys)) + 100
 
-    transXs, transYs = translate_coords_to_positive(
+    trans_xs, trans_ys = translate_coords_to_positive(
         orig_xs, orig_ys, trans_x, trans_y)
 
     # Find the max coordinate to help determine the width (D3)
-    max_x = max(transXs)
+    max_x = max(trans_xs)
     text_data = []
     for i in range(0, len(orig_xs)):
-        temp = text_attrs_dictionary(file_names[i], transXs[i], transYs[i])
+        temp = text_attrs_dictionary(file_names[i], trans_xs[i], trans_ys[i])
         text_data.append(temp)
 
     # Make a color gradient with k colors

lexos/views/rolling_window_view.py

@@ -44,20 +44,20 @@ def rolling_window():
             numActiveDocs=num_active_docs)
     if request.method == "POST":
         # "POST" request occurs when user hits submit (Get Graph) button
-        dataPoints, dataList, graphTitle, xAxisLabel, yAxisLabel, \
+        data_points, data_list, graph_title, x_axis_label, y_axis_label, \
             legend_labels = utility.generate_rwa(file_manager)
         if 'get-RW-plot' in request.form:
             # The 'Graph Data' button is clicked on rollingwindow.html.
             save_path, file_extension = utility.generate_rw_matrix_plot(
-                dataPoints, legend_labels)
+                data_points, legend_labels)
             return send_file(
                 save_path,
                 attachment_filename="rollingwindow_matrix" +
                                     file_extension,
                 as_attachment=True)
         if 'get-RW-data' in request.form:
             # The 'CSV Matrix' button is clicked on rollingwindow.html.
-            save_path, file_extension = utility.generate_rw_matrix(dataList)
+            save_path, file_extension = utility.generate_rw_matrix(data_list)
             return send_file(
                 save_path,
                 attachment_filename="rollingwindow_matrix" +
@@ -68,10 +68,10 @@ def rolling_window():
             return render_template(
                 'rwanalysis.html',
                 labels=labels,
-                data=dataPoints,
-                graphTitle=graphTitle,
-                xAxisLabel=xAxisLabel,
-                yAxisLabel=yAxisLabel,
+                data=data_points,
+                graphTitle=graph_title,
+                xAxisLabel=x_axis_label,
+                yAxisLabel=y_axis_label,
                 legendLabels=legend_labels,
                 rwadatagenerated=True,
                 itm="rolling-windows",
@@ -80,10 +80,10 @@ def rolling_window():
             return render_template(
                 'rwanalysis.html',
                 labels=labels,
-                data=dataPoints,
-                graphTitle=graphTitle,
-                xAxisLabel=xAxisLabel,
-                yAxisLabel=yAxisLabel,
+                data=data_points,
+                graphTitle=graph_title,
+                xAxisLabel=x_axis_label,
+                yAxisLabel=y_axis_label,
                 legendLabels=legend_labels,
                 rwadatagenerated=False,
                 itm="rolling-windows",

test/test_suite/Statistics/Stats_Compare/FilesToUse/Heart_of_Darkness(no_punc&lowercase&no_digits).txt

@@ -1,19 +1,3 @@
-
-
-
-
-
-produced by judith boss and david widger
-
-
-
-
-
-note see also etext  which is a different version of this ebook
-
-heart of darkness
-
-
 by joseph conrad
 
 
@@ -192,7 +176,7 @@ noses than ourselves is not a pretty thing when you look into it too
 much what redeems it is the idea only an idea at the back of it not
 a sentimental pretense but an idea and an unselfish belief in the
 ideasomething you can set up and bow down before and offer a
-sacrifice to   
+sacrifice to
 
 he broke off flames glided in the river small green flames red
 flames white flames pursuing overtaking joining crossing each
@@ -884,7 +868,7 @@ exceptional man of the greatest importance to the company therefore
 i could understand his anxiety he was he said very very uneasy
 certainly he fidgeted on his chair a good deal exclaimed ah mr
 kurtz broke the stick of sealingwax and seemed dumbfounded by the
-accident next thing he wanted to know how long it would take to   
+accident next thing he wanted to know how long it would take to
 i interrupted him again being hungry you know and kept on my feet
 too i was getting savage how could i tell i said i hadnt even
 seen the wreck yetsome months no doubt all this talk seemed to me
@@ -1042,7 +1026,7 @@ pace away from there i felt a hand introducing itself under my arm
 my dear sir said the fellow i dont want to be misunderstood and
 especially by you who will see mr kurtz long before i can have that
 pleasure i wouldnt like him to get a false idea of my
-disposition   
+disposition
 
 
 i let him run on this papiermache mephistopheles and it seemed to
@@ -1091,17 +1075,17 @@ anything it seems to me i am trying to tell you a dreammaking a vain
 attempt because no relation of a dream can convey the dreamsensation
 that commingling of absurdity surprise and bewilderment in a tremor of
 struggling revolt that notion of being captured by the incredible which
-is of the very essence of dreams   
+is of the very essence of dreams
 
 he was silent for a while
 
    no it is impossible it is impossible to convey the
 lifesensation of any given epoch of ones existencethat which
 makes its truth its meaningits subtle and penetrating essence it is
-impossible we live as we dreamalone   
+impossible we live as we dreamalone
 
 he paused again as if reflecting then addedof course in this you
-fellows see more than i could then you see me whom you know   
+fellows see more than i could then you see me whom you know
 
 it had become so pitch dark that we listeners could hardly see one
 another for a long time already he sitting apart had been no more
@@ -1770,7 +1754,7 @@ given me an irresistible impression of sorrow the glimpse of the
 steamboat had for some reason filled those savages with unrestrained
 grief the danger if any i expounded was from our proximity to a
 great human passion let loose even extreme grief may ultimately vent
-itself in violencebut more generally takes the form of apathy   
+itself in violencebut more generally takes the form of apathy
 
 you should have seen the pilgrims stare they had no heart to grin or
 even to revile me but i believe they thought me gone madwith fright
@@ -1964,7 +1948,7 @@ of emotion even such as i had noticed in the howling sorrow of these
 savages in the bush i couldnt have felt more of lonely desolation
 somehow had i been robbed of a belief or had missed my destiny in
 life    why do you sigh in this beastly way somebody absurd well
-absurd good lord mustnt a man everhere give me some tobacco   
+absurd good lord mustnt a man everhere give me some tobacco
 
 there was a pause of profound stillness then a match flared and
 marlows lean face appeared worn hollow with downward folds and
@@ -2221,8 +2205,8 @@ listen to him he exclaimed with severe exaltation but now he
 waved his arm and in the twinkling of an eye was in the uttermost
 depths of despondency in a moment he came up again with a jump
 possessed himself of both my hands shook them continuously while he
-gabbled brother sailor    honor    pleasure    delight   
-introduce myself    russian    son of an archpriest   
+gabbled brother sailor    honor    pleasure    delight
+introduce myself    russian    son of an archpriest
 government of tambov    what tobacco english tobacco the excellent
 english tobacco now thats brotherly smoke wheres a sailor that
 does not smoke
@@ -2452,7 +2436,7 @@ doing my best to keep him alive and thats enough i had no hand in
 all this i have no abilities there hasnt been a drop of medicine or a
 mouthful of invalid food for months here he was shamefully abandoned
 a man like this with such ideas shamefully shamefully iihavent
-slept for the last ten nights   
+slept for the last ten nights
 
 his voice lost itself in the calm of the evening the long shadows of
 the forest had slipped down hill while we talked had gone far beyond
@@ -2586,7 +2570,7 @@ mesave the ivory you mean dont tell me save me why ive had
 to save you you are interrupting my plans now sick sick not so sick
 as you would like to believe never mind ill carry my ideas out
 yeti will return ill show you what can be done you with your little
-peddling notionsyou are interfering with me i will return i   
+peddling notionsyou are interfering with me i will return i
 
 the manager came out he did me the honor to take me under the arm and
 lead me aside he is very low very low he said he considered it
@@ -2670,7 +2654,7 @@ him recite poetryhis own too it was he told me poetry he rolled
 his eyes at the recollection of these delights oh he enlarged my
 mind goodby said i he shook hands and vanished in the night
 sometimes i ask myself whether i had ever really seen himwhether it
-was possible to meet such a phenomenon   
+was possible to meet such a phenomenon
 
 when i woke up shortly after midnight his warning came to my mind with
 its hint of danger that seemed in the starred darkness real enough to
@@ -3276,12 +3260,12 @@ every sigh every word every sign every glance
 i felt like a chill grip on my chest dont i said in a muffled
 voice
 
-forgive me iihave mourned so long in silencein silence   
+forgive me iihave mourned so long in silencein silence
 you were with himto the last i think of his loneliness nobody near
 to understand him as i would have understood perhaps no one to
-hear   
+hear
 
-to the very end i said shakily i heard his very last words   
+to the very end i said shakily i heard his very last words
 i stopped in a fright
 
 repeat them she said in a heartbroken tone i wanti
@@ -3308,7 +3292,7 @@ the heavens would fall upon my head but nothing happened the heavens
 do not fall for such a trifle would they have fallen i wonder if i
 had rendered kurtz that justice which was his due hadnt he said he
 wanted only justice but i couldnt i could not tell her it would have
-been too darktoo dark altogether   
+been too darktoo dark altogether
 
 marlow ceased and sat apart indistinct and silent in the pose of a
 meditating buddha nobody moved for a time we have lost the first of