Merge branch 'develop' into ml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownExportedFiles">
+    <htmlFiles />
+    <imageFiles />
+    <otherFiles />
+  </component>
+</project>
\ No newline at end of file

@@ -8,7 +8,17 @@
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file:///tmp" />
+  </component>
 </project>
 </project>
\ No newline at end of file

@@ -26,7 +26,30 @@
             <artifactId>spark-mllib_2.11</artifactId>
             <artifactId>spark-mllib_2.11</artifactId>
             <version>2.3.0</version>
             <version>2.3.0</version>
         </dependency>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-sql_2.11</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.databricks</groupId>
+            <artifactId>spark-csv_2.11</artifactId>
+            <version>1.5.0</version>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>
 </project>
\ No newline at end of file

+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.Row;
+import org.apache.spark.sql.SparkSession;
+import org.apache.spark.sql.expressions.Window;
+import org.apache.spark.sql.expressions.WindowSpec;
+
+import static org.apache.spark.sql.functions.*;
+import static org.apache.spark.sql.functions.lit;
+import static org.apache.spark.sql.functions.when;
+
+public class Aggregation {
+
+    public static void main(String[] args) throws Exception {
+
+        //Create Session
+        SparkSession spark = SparkSession
+                .builder()
+                .appName("Detecting Fraud Clicks")
+                .master("local")
+                .getOrCreate();
+        
+        // Aggregation
+        Aggregation agg = new Aggregation();
+        
+        Dataset<Row> dataset = agg.loadCSVDataSet("./train_sample.csv", spark);
+        dataset = agg.changeTimestempToLong(dataset);
+        dataset = agg.averageValidClickCount(dataset);
+        dataset = agg.clickTimeDelta(dataset);
+        dataset = agg.countClickInTenMinutes(dataset);
+        
+        //test
+        dataset.where("ip == '5348' and app == '19'").show(10);
+    }
+        
+        
+    private Dataset<Row> loadCSVDataSet(String path, SparkSession spark){
+        // Read SCV to DataSet
+        return spark.read().format("csv")
+                .option("inferSchema", "true")
+                .option("header", "true")
+                .load(path);
+    }
+    
+    private Dataset<Row> changeTimestempToLong(Dataset<Row> dataset){
+        // cast timestamp to long
+        Dataset<Row> newDF = dataset.withColumn("utc_click_time", dataset.col("click_time").cast("long"));
+        newDF = newDF.withColumn("utc_attributed_time", dataset.col("attributed_time").cast("long"));
+        newDF = newDF.drop("click_time").drop("attributed_time");
+        return newDF;
+    }
+         
+    private Dataset<Row> averageValidClickCount(Dataset<Row> dataset){
+        // set Window partition by 'ip' and 'app' order by 'utc_click_time' select rows between 1st row to current row
+        WindowSpec w = Window.partitionBy("ip", "app")
+                .orderBy("utc_click_time")
+                .rowsBetween(Window.unboundedPreceding(), Window.currentRow());
+
+        // aggregation
+        Dataset<Row> newDF = dataset.withColumn("cum_count_click", count("utc_click_time").over(w));
+        newDF = newDF.withColumn("cum_sum_attributed", sum("is_attributed").over(w));
+        newDF = newDF.withColumn("avg_valid_click_count", col("cum_sum_attributed").divide(col("cum_count_click")));
+        newDF = newDF.drop("cum_count_click", "cum_sum_attributed");
+        return newDF;
+    }
+
+    private Dataset<Row> clickTimeDelta(Dataset<Row> dataset){
+        WindowSpec w = Window.partitionBy ("ip")
+                .orderBy("utc_click_time");
+
+        Dataset<Row> newDF = dataset.withColumn("lag(utc_click_time)", lag("utc_click_time",1).over(w));
+        newDF = newDF.withColumn("click_time_delta", when(col("lag(utc_click_time)").isNull(),
+                lit(0)).otherwise(col("utc_click_time")).minus(when(col("lag(utc_click_time)").isNull(),
+                lit(0)).otherwise(col("lag(utc_click_time)"))));
+        newDF = newDF.drop("lag(utc_click_time)");
+        return newDF;
+    }
+    
+    private Dataset<Row> countClickInTenMinutes(Dataset<Row> dataset){
+        WindowSpec w = Window.partitionBy("ip")
+                .orderBy("utc_click_time")
+                .rangeBetween(Window.currentRow(),Window.currentRow()+600);
+
+        Dataset<Row> newDF = dataset.withColumn("count_click_in_ten_mins",
+                (count("utc_click_time").over(w)).minus(1));    //TODO 본인것 포함할 것인지 정해야함.
+        return newDF;
+    }
+}

-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-/**
- * Calendar 객체 관련 기능들을 모아놓은 유틸리티 클래스
- *
- * @author croute
- * @since 2011.02.10
- */
-public class DateUtil
-{
-
-    /**
-     * 캘린더 객체를 yyyy-MM-dd HH:mm:ss 형태의 문자열로 변환합니다.
-     *
-     * @param cal 캘린더 객체
-     * @return 변환된 문자열
-     */
-    public static String StringFromCalendar(Calendar cal)
-    {
-        // 날짜를 통신용 문자열로 변경
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        return formatter.format(cal.getTime());
-    }
-
-    /**
-     * 캘린더 객체를 yyyy-MM-dd형태의 문자열로 변환합니다.
-     *
-     * @param cal 캘린더 객체
-     * @return 변환된 문자열
-     */
-    public static String StringSimpleFromCalendar(Calendar cal)
-    {
-        // 날짜를 통신용 문자열로 변경
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-        return formatter.format(cal.getTime());
-    }
-
-    /**
-     * yyyy-MM-dd HH:mm:ss 형태의 문자열을 캘린더 객체로 변환합니다.
-     * 만약 변환에 실패할 경우 오늘 날짜를 반환합니다.
-     *
-     * @param date 날짜를 나타내는 문자열
-     * @return 변환된 캘린더 객체
-     */
-    public static Calendar CalendarFromString(String date)
-    {
-        if (date.length() == 0)
-            return  null;
-        Calendar cal = Calendar.getInstance();
-        try
-        {
-            //String oldstring = "2011-01-18 00:00:00.0";
-            // Date date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S").parse(oldstring);
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            cal.setTime(formatter.parse(date));
-        }
-        catch(ParseException e)
-        {
-            e.printStackTrace();
-        }
-        return cal;
-    }
-
-    /**
-     * yyyy-MM-dd 형태의 문자열을 캘린더 객체로 변환합니다.
-     * 만약 변환에 실패할 경우 오늘 날짜를 반환합니다.
-     *
-     * @param date 날짜를 나타내는 문자열
-     * @return 변환된 캘린더 객체
-     */
-    public static Calendar CalendarFromStringSimple(String date)
-    {
-        Calendar cal = Calendar.getInstance();
-
-        try
-        {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-            cal.setTime(formatter.parse(date));
-        }
-        catch(ParseException e)
-        {
-            e.printStackTrace();
-        }
-        return cal;
-    }
-}
\ No newline at end of file

@@ -22,22 +22,6 @@ import java.util.*;
 
 
 // ml
 // ml
 
 
-//ip,app,device,os,channel,click_time,attributed_time,is_attributed
-//87540,12,1,13,497,2017-11-07 09:30:38,,0
-
-class RecordComparator implements Comparator<Record> {
-    @Override
-    public int compare(Record v1 , Record v2) {
-//        if(a.ano < b.ano) return -1;
-//        else if(a.ano == b.ano) return 0;
-//        else return 1;
-        if (v1.ip.compareTo(v2.ip) == 0) {
-            return v1.clickTime.compareTo(v2.clickTime);
-        }
-        return  v1.ip.compareTo(v2.ip);
-    }
-}
-
 public class MapExample {
 public class MapExample {
 
 
     static SparkConf conf = new SparkConf().setMaster("local[*]").setAppName("Cesco");
     static SparkConf conf = new SparkConf().setMaster("local[*]").setAppName("Cesco");
@@ -45,122 +29,10 @@ public class MapExample {
     static SQLContext sqlContext = new SQLContext(sc);
     static SQLContext sqlContext = new SQLContext(sc);
     
     
     public static void main(String[] args) throws Exception {
     public static void main(String[] args) throws Exception {
-        JavaRDD<String> file = sc.textFile("data/train.csv", 1);
-
-        final String header = file.first();
-        JavaRDD<String> data = file.filter(line -> !line.equalsIgnoreCase(header));
-
-        JavaRDD<Record> records = data.map(line -> {
-            String[] fields = line.split(",");
-            Record sd = new Record(Integer.parseInt(fields[0]), Integer.parseInt(fields[1]), Integer.parseInt(fields[2]), Integer.parseInt(fields[3]), Integer.parseInt(fields[4]), fields[5], fields[6], Integer.parseInt(fields[7].trim()));
-            return sd;
-        });
-
-//        JavaRDD<Tuple4<Integer,Double,Long,Integer>> secondSortRDD = firstSortRDD.keyBy(new Function<Tuple4<Integer, Double, Long, Integer>, Tuple2<Double, Long>>(){
-//            @Override
-//            public Tuple2<Double, Long> call(Tuple4<Integer, Double, Long, Integer> value) throws Exception {
-//                return new Tuple2(value._2(),value._3());
-//            }}).sortByKey(new TupleComparator()).values();
-
-        JavaRDD<Record> firstSorted = records.sortBy(new Function<Record, String>() {
-            @Override
-            public String call(Record record) throws Exception {
-                return record.clickTime;
-            }
-        }, true, 1);
-
-        JavaRDD<Record> sortedRecords = firstSorted.sortBy(new Function<Record, Integer>() {
-            @Override
-            public Integer call(Record record) throws Exception {
-                return record.ip.intValue();
-            }
-        }, true, 1);
-
-
-        /*
-        //두개를 한번에 정렬해보려 했지만 실패
-        JavaRDD<Record> sortedRecords = records.keyBy(new Function<Record, Record>(){
-            @Override
-            public Record call(Record record) throws Exception {
-                return new Record(record.ip, record.app, record.device, record.os, record.channel, record.clickTime, record.attributedTime, record.isAttributed);
-            }}).sortByKey(new RecordComparator()).values();
-        */
-
-//        System.out.println("sortedRecords");
-//        sortedRecords.foreach(record -> {System.out.println(record.ip + " " + record.clickTime.getTime());});
-
-//        System.out.println("make result");
-        /*
-        //map의 다음것을 가져오려했지만 실패
-        JavaRDD<Record> result = sortedRecords.map(record -> {
-            System.out.println("make addTen");
-            Calendar addTen = Calendar.getInstance();
-            addTen.setTime(record.clickTime.getTime());
-            addTen.add(Calendar.MINUTE, 10);
-
-            System.out.println("make count");
-            int count = 0;
-            for (Record temp: sortedRecords.collect()) {
-                if (temp.ip.compareTo(record.ip) == 0 && temp.clickTime.compareTo(record.clickTime) > 0 && temp.clickTime.compareTo(addTen)< 0)
-                    count++;
-            }
-
-            return new Record(record.ip, record.app, record.device, record.os, record.channel, record.clickTime, record.attributedTime, record.isAttributed, count);
-        });
-        */
-//        System.out.println("result");
-//        result.foreach(record -> {System.out.println(record.ip + " " + record.clickTime.getTime());});
-
-        /*
-
-        for (final ListIterator<String> it = list.listIterator(); it.hasNext();) {
-            final String s = it.next();
-            System.out.println(it.previousIndex() + ": " + s);
-        }
-
-        for (ListIterator<Record> it = sortedRecords.collect().listIterator(); it.hasNext(); it = it.nextIndex()) {
-            it.
-            if (temp.ip.compareTo(record.ip) == 0 && temp.clickTime.compareTo(record.clickTime) > 0 && temp.clickTime.compareTo(addTen)< 0)
-                count++;
-        }
-        */
-
-
-        List<Record> list = sortedRecords.collect();
-
-        List<Record> resultList = new ArrayList<Record>();
-        for (int i = 0; i < list.size(); i++) {
-            //System.out.println(list.get(i).ip);
-
-            Record record = list.get(i);
-
-            Calendar recordI = DateUtil.CalendarFromString(record.clickTime);
-            
-            Calendar addTen = Calendar.getInstance();
-            addTen.setTime(recordI.getTime());
-            addTen.add(Calendar.MINUTE, 10);
-
-            int count = 0;
-
-            for (int j = i+1; j < list.size() && list.get(j).ip.compareTo(record.ip) == 0; j++) {
-                Calendar recordJ = DateUtil.CalendarFromString(list.get(j).clickTime);
-                if (recordJ.compareTo(recordI) > 0 && recordJ.compareTo(addTen) < 0) {
-                    count++;                    
-                } else {
-                    break;
-                }
-            }
-
-            resultList.add(new Record(record.ip, record.app, record.device, record.os, record.channel, record.clickTime, record.attributedTime, record.isAttributed, count));
-
-        }
-
-        JavaRDD<Record> result = sc.parallelize(resultList);
-//        result.foreach(record -> {System.out.println(record.ip + " " + record.clickTime.getTime() + " " + record.clickInTenMins);});
         
         
         // Automatically identify categorical features, and index them.
         // Automatically identify categorical features, and index them.
         // Set maxCategories so features with > 4 distinct values are treated as continuous.
         // Set maxCategories so features with > 4 distinct values are treated as continuous.
-        Dataset<Row> resultds = sqlContext.createDataFrame(result, Record.class);
+        Dataset<Row> resultds = sqlContext.createDataFrame(result);
 
 
         System.out.println("schema start");
         System.out.println("schema start");
         resultds.printSchema();
         resultds.printSchema();

-import scala.Serializable;
-
-public class Record implements Serializable {
-    Integer ip;
-    Integer app;
-    Integer device;
-    Integer os;
-    Integer channel;
-    String clickTime;
-    String attributedTime;
-    Integer isAttributed;
-    Integer clickInTenMins;
-
-    // constructor , getters and setters
-    public Record(int pIp, int pApp, int pDevice, int pOs, int pChannel, String pClickTime, String pAttributedTime, Integer pIsAttributed) {
-        ip = new Integer(pIp);
-        app = new Integer(pApp);
-        device = new Integer(pDevice);
-        os = new Integer(pOs);
-        channel = new Integer(pChannel);
-        clickTime = pClickTime;
-        attributedTime = pAttributedTime;
-        isAttributed = new Integer(pIsAttributed);
-        clickInTenMins = new Integer(0);
-    }
-
-    public Record(int pIp, int pApp, int pDevice, int pOs, int pChannel, String pClickTime, String pAttributedTime, Integer pIsAttributed, int pClickInTenMins) {
-        ip = new Integer(pIp);
-        app = new Integer(pApp);
-        device = new Integer(pDevice);
-        os = new Integer(pOs);
-        channel = new Integer(pChannel);
-        clickTime = pClickTime;
-        attributedTime = pAttributedTime;
-        isAttributed = new Integer(pIsAttributed);
-        clickInTenMins = new Integer(pClickInTenMins);
-    }
-
-    public Integer getIp() {
-        return ip;
-    }
-
-    public void setIp(Integer ip) {
-        this.ip = ip;
-    }
-
-    public Integer getApp() {
-        return app;
-    }
-
-    public void setApp(Integer app) {
-        this.app = app;
-    }
-
-    public Integer getDevice() {
-        return device;
-    }
-
-    public void setDevice(Integer device) {
-        this.device = device;
-    }
-
-    public Integer getOs() {
-        return os;
-    }
-
-    public void setOs(Integer os) {
-        this.os = os;
-    }
-
-    public Integer getChannel() {
-        return channel;
-    }
-
-    public void setChannel(Integer channel) {
-        this.channel = channel;
-    }
-
-    public String getClickTime() {
-        return clickTime;
-    }
-
-    public void setClickTime(String clickTime) {
-        this.clickTime = clickTime;
-    }
-
-    public String getAttributedTime() {
-        return attributedTime;
-    }
-
-    public void setAttributedTime(String attributedTime) {
-        this.attributedTime = attributedTime;
-    }
-
-    public Integer getAttributed() {
-        return isAttributed;
-    }
-
-    public void setAttributed(Integer attributed) {
-        isAttributed = attributed;
-    }
-
-    public Integer getClickInTenMins() {
-        return clickInTenMins;
-    }
-
-    public void setClickInTenMins(Integer clickInTenMins) {
-        this.clickInTenMins = clickInTenMins;
-    }
-}
\ No newline at end of file

-public class valid {
-    private int x;
-    
-    valid() {
-        x = 0;
-    }
-    
-    void printX(){
-        System.out.println(x);
-    }
-    
-    public static void main(String[] args){
-        valid v = new valid();
-        v.printX();
-    }
-    
-}