Commit 3814f4f8 authored by feng's avatar feng

Order inversion 3

parent 9f21c02f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="05d59ada-3cd7-4c26-9a9f-8ed545f37173" name="Default" comment=""> <list default="true" id="05d59ada-3cd7-4c26-9a9f-8ed545f37173" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/OrderInversion.java" afterPath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/OrderInversion.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/OrderInversion.java" afterPath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/OrderInversion.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java" afterPath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="labs.iws" /> <ignored path="labs.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -54,25 +54,11 @@ ...@@ -54,25 +54,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="TextPair.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/TextPair.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1251#1252#0" expanded="true" />
<element signature="e#1310#1311#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="OrderInversion.java" pinned="false" current-in-tab="true"> <file leaf-file-name="OrderInversion.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/OrderInversion.java"> <entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/OrderInversion.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.7808219"> <state vertical-scroll-proportion="0.48630136">
<caret line="51" column="41" selection-start-line="51" selection-start-column="41" selection-end-line="51" selection-end-column="41" /> <caret line="89" column="0" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -137,7 +123,7 @@ ...@@ -137,7 +123,7 @@
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="-1" /> <option name="x" value="-1" />
<option name="y" value="27" /> <option name="y" value="27" />
<option name="width" value="962" /> <option name="width" value="1922" />
<option name="height" value="1054" /> <option name="height" value="1054" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectLevelVcsManager" settingsEditedManually="false">
...@@ -471,7 +457,7 @@ ...@@ -471,7 +457,7 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-1" y="27" width="962" height="1054" extended-state="4" /> <frame x="-1" y="27" width="1922" height="1054" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
...@@ -545,7 +531,6 @@ ...@@ -545,7 +531,6 @@
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="99" column="42" selection-start-line="99" selection-start-column="42" selection-end-line="99" selection-end-column="42" /> <caret line="99" column="42" selection-start-line="99" selection-start-column="42" selection-end-line="99" selection-end-column="42" />
<folding> <folding>
<element signature="imports" expanded="true" />
<element signature="e#1251#1252#0" expanded="true" /> <element signature="e#1251#1252#0" expanded="true" />
<element signature="e#1310#1311#0" expanded="true" /> <element signature="e#1310#1311#0" expanded="true" />
</folding> </folding>
...@@ -623,7 +608,6 @@ ...@@ -623,7 +608,6 @@
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="54" column="0" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" /> <caret line="54" column="0" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" />
<element signature="e#1251#1252#0" expanded="true" /> <element signature="e#1251#1252#0" expanded="true" />
<element signature="e#1310#1311#0" expanded="true" /> <element signature="e#1310#1311#0" expanded="true" />
</folding> </folding>
...@@ -932,44 +916,43 @@ ...@@ -932,44 +916,43 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/TextPair.java"> <entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/TextPair.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.10273973">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="9" column="47" selection-start-line="9" selection-start-column="47" selection-end-line="9" selection-end-column="47" />
<folding> <folding>
<element signature="imports" expanded="true" />
<element signature="e#1251#1252#0" expanded="true" /> <element signature="e#1251#1252#0" expanded="true" />
<element signature="e#1310#1311#0" expanded="true" /> <element signature="e#1310#1311#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java"> <entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/Stripes.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" /> <caret line="105" column="0" selection-start-line="105" selection-start-column="0" selection-end-line="105" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2235#2236#0" expanded="true" />
<element signature="e#2298#2299#0" expanded="true" />
<element signature="e#2537#2538#0" expanded="true" />
<element signature="e#2588#2589#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/Stripes.java"> <entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="105" column="0" selection-start-line="105" selection-start-column="0" selection-end-line="105" selection-end-column="0" /> <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2235#2236#0" expanded="true" />
<element signature="e#2298#2299#0" expanded="true" />
<element signature="e#2537#2538#0" expanded="true" />
<element signature="e#2588#2589#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/OrderInversion.java"> <entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/OrderInversion.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.7808219"> <state vertical-scroll-proportion="0.48630136">
<caret line="51" column="41" selection-start-line="51" selection-start-column="41" selection-end-line="51" selection-end-column="41" /> <caret line="89" column="0" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
......
...@@ -87,13 +87,12 @@ public class OrderInversion extends Configured implements Tool { ...@@ -87,13 +87,12 @@ public class OrderInversion extends Configured implements Tool {
for (IntWritable value : values) { for (IntWritable value : values) {
totalnumber += value.get(); totalnumber += value.get();
} }
context.write(key, new DoubleWritable(totalnumber));
} else { } else {
int count = 0; int count = 0;
for (IntWritable value : values) { for (IntWritable value : values) {
count += value.get(); count += value.get();
} }
context.write(key, new DoubleWritable(count / totalnumber)); context.write(key, new DoubleWritable(count / totalnumber));
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment