update the comparator

Author: ryo

src/main/java/io/ascending/training/collection/AgeComparator.java

@@ -5,6 +5,6 @@
 public class AgeComparator implements Comparator<Employee> {
     @Override
     public int compare(Employee e1, Employee e2) {
-        return (int) (e1.getSalary() - e2.getSalary());
+        return (int) (e1.getAge() - e2.getAge());
     }
 }

src/main/java/io/ascending/training/collection/FirstNameComparator.java

@@ -0,0 +1,28 @@
+package io.ascending.training.collection;
+
+import java.util.Comparator;
+
+public class FirstNameComparator implements Comparator<Employee> {
+    @Override
+    public int compare(Employee e1, Employee e2) {
+//        char[] e1FirstNames = e1.getName().toCharArray();
+//        char[] e2FirstNames = e2.getName().toCharArray();
+//        //"zhang" , "zhang"
+//        int size=e1FirstNames.length;
+//        for(int i=0;i<size-1;i++){
+//            if(e1FirstNames[i]-e2FirstNames[i]==0){
+//                continue;
+//            }else{
+//                return e1FirstNames[i]-e2FirstNames[i];
+//            }
+//        }
+//        return 0;
+        //"st1 - str2" == str1.compareTo(str2);
+//        return e1.getName().compareTo(e2.getName());
+        if(e1.getName().compareTo(e2.getName())==0){
+           return Long.valueOf(e1.getSalary() - e2.getSalary()).intValue();
+        }else{
+            return e1.getName().compareTo(e2.getName());
+        }
+    }
+}

src/main/java/io/ascending/training/collection/SalaryComparator.java

@@ -5,6 +5,6 @@
 public class SalaryComparator implements Comparator<Employee> {
     @Override
     public int compare(Employee e1, Employee e2) {
-        return (int) (e1.getSalary() - e2.getSalary());
+        return Long.valueOf(e1.getSalary() - e2.getSalary()).intValue();
     }
 }

src/main/java/io/ascending/training/collection/Solution.java

@@ -1,6 +1,7 @@
 package io.ascending.training.collection;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 
 public class Solution {
@@ -47,15 +48,17 @@ public static void main(String[] args){
         //sorting employees array using Comparable interface implementation
         Arrays.sort(empArr);
         System.out.println("Default Sorting of Employees list:\n"+Arrays.toString(empArr));
-//        Comparator<Employee> salaryComparator = (e1, e2)->(int)(e1.getSalary()-e2.getSalary());
-        Arrays.sort(empArr, new SalaryComparator());
-        System.out.println("Employees list sorted by Salary:\n"+Arrays.toString(empArr));
+        Arrays.sort(empArr, new AgeComparator());
 
-        //sort employees array using Comparator by Age
-        Arrays.sort(empArr, (o1, o2)->o1.getAge()-o2.getAge());
+        Comparator<Employee> salaryComparator = (e1, e2)->(int)(e1.getSalary()-e2.getSalary());
+        Arrays.sort(empArr, salaryComparator);
+        System.out.println("Employees list sorted by Salary:\n"+Arrays.toString(empArr));
+//
+//        //sort employees array using Comparator by Age
+        Arrays.sort(empArr,(o1, o2)->o1.getAge()-o2.getAge());
         System.out.println("Employees list sorted by Age:\n"+Arrays.toString(empArr));
-
-        //sort employees array using Comparator by Name
+//
+//        //sort employees array using Comparator by Name
         Arrays.sort(empArr, NameComparator);
         System.out.println("Employees list sorted by Name:\n"+Arrays.toString(empArr));
     }

src/main/java/io/ascending/training/lambda/LambdaTest.java

@@ -27,6 +27,15 @@ public static void main(String[] args){
         MyString classString = new LambdaTest.MyStringImpl();
         System.out.println(classString.myStringFunction("Ryo"));
 
+        MyString classString2 = new MyString() {
+            @Override
+            public String myStringFunction(String str) {
+                return "Good Morning " + str + "!";
+            }
+        };
+        System.out.println(classString2.myStringFunction("Ryo"));
+
+
 
         MyString value = (str) -> "Good Morning " + str + "!";
         MyString value2 = (str) -> "Good Afternoon " + str + "!";;

src/main/java/io/ascending/training/operator/Assignment.java

@@ -1,5 +1,8 @@
 package io.ascending.training.operator;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Assignment {
     class Test
     {
@@ -36,10 +39,11 @@ public static void main(String[] args)
         f = f * 2;
 
         // shorthand assignment operator
-        a += 1;
-        b -= 1;
-        e *= 2;
-        f /= 2;
+        a -= 1;
+        b += 1;
+        e /= 2;
+        f *= 2;
+
         System.out.println("a, b, e, f ("
                 + "using shorthand operators)= "
                 + a + ", " + b + ", "
@@ -48,7 +52,7 @@ public static void main(String[] args)
         System.out.println("a, b ("
                 + "pass by value)= "
                 + a + ", " + b);
-
+//
         Integer i = new Integer(10);
         Integer j = new Integer(20);
         swap(i, j);
@@ -58,11 +62,21 @@ public static void main(String[] args)
         int jx = 20;
         swapValue(ix,jx);
         System.out.println(ix);
+        System.out.println(jx);
+
+        List<Integer> integerList = new ArrayList();
+        addValue(integerList);
+        System.out.println(integerList);
 //        Test t = new Test(5);
 //        change(t);
 //        System.out.println(t.x);
     }
 
+    public static void addValue(List<Integer> ls){
+        ls.add(new Integer(5));
+    }
+
+    //a=copy(ix), b=copy(jx)
     public static void swapValue(int a, int b){
         int temp=b;
         b=a;

src/main/java/io/ascending/training/operator/Shift.java

@@ -9,12 +9,12 @@ public static void main(String[] args)
 
         // left shift operator
         // 0000 0101<<2 =0001 0100(20)
-        // similar to 5*(2^2)
+        // similar to 5*(2^left shift n time)
         System.out.println("a<<2 = " + (a << 2));
 
         // right shift operator
         // 0000 0101 >> 2 =0000 0001(1)
-        // similar to 5/(2^2)
+        // similar to 5/(2^ right shift n time)
         System.out.println("a>>2 = " + (a >> 2));
 
         // unsigned right shift operator

src/main/java/io/ascending/training/time/DateExample.java

@@ -2,6 +2,9 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 public class DateExample {
@@ -17,7 +20,26 @@ public static void main(String[] args){
         LocalDate ld = LocalDate.now();
         System.out.println(ld);
 
+//        LocalDateTime.of(10,5,5,30,0,0);
         LocalDateTime ldtparse = LocalDateTime.parse("2019-06-22T23:29:58.309");
         System.out.println(ldtparse);
+
+        System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("MM/dd/yyyy")));
+
+//        Date d = new Date();
+//        new Date(d.getTime()+1000*60*60*24);
+//        d.getTime();
+
+//        System.out.println(LocalDate.now().plusDays(1).plusMonths(1));
+//        System.out.println(LocalDateTime.now());
+
+//        System.out.println(ZonedDateTime.now());
+//        ZonedDateTime dc = ZonedDateTime.now();
+//        System.out.println(dc);
+//        ZoneId swissZone = ZoneId.of("Europe/Zurich");
+//        ZonedDateTime swissZoned = dc.withZoneSameInstant(swissZone);
+//        LocalDateTime swissLocal = swissZoned.toLocalDateTime();
+//        System.out.println(swissZoned);
+//        System.out.println(swissLocal);
     }
 }