Reduced LOC + FeedSorter sorts by category, author, title and date/time + reduced learning rate from 0.3 to 0.2

2 files changed, 84 insertions, 22 deletions

diff --git a/app/src/androidTest/java/org/rssin/neurons/FeedSorterTest.java b/app/src/androidTest/java/org/rssin/neurons/FeedSorterTest.java
index a2d59ee..a6e3581 100755
--- a/app/src/androidTest/java/org/rssin/neurons/FeedSorterTest.java
+++ b/app/src/androidTest/java/org/rssin/neurons/FeedSorterTest.java
@@ -20,7 +20,7 @@ public class FeedSorterTest extends TestCase {
         Assert.assertTrue(true);

     }

 

-    public void testSortItems() throws Exception {

+    public void testSortItemsByCategory() throws Exception {

         List<String> gameList = new ArrayList<>();

         gameList.add("Games");

         List<String> sportList = new ArrayList<>();

@@ -39,28 +39,90 @@ public class FeedSorterTest extends TestCase {
         FeedSorter s = new FeedSorter();

 

         //I like games & I hate sports

-        for(int i = 0; i < 100; i++)

-        {

-            for(FeedItem item : likedItems)

-            {

-                s.feedback(item, Feedback.Like);

-            }

-

-            for(FeedItem item : dislikedItems)

-            {

-                s.feedback(item, Feedback.Dislike);

-            }

-        }

+        trainNetwork(likedItems, dislikedItems, s);

 

         FeedItem sportsItem = new FeedItem("", new Date(2014, 1, 1, 1, 2, 1), "SPORT ARTICLE", "DESCRIPTION", "", "Randy", sportList, "", "", "");

         FeedItem gamesItem = new FeedItem("", new Date(2014, 1, 1, 1, 1, 1), "GAME ARTICLE", "DESCRIPTION", "", "Randy", gameList, "", "", "");

 

+        testSortingOrder(s, sportsItem, gamesItem);

+    }

+

+    public void testSortItemsByTitle() throws Exception {

+        List<String> emptyList = new ArrayList<>();

+

+        FeedItem[] likedItems = new FeedItem[]

+                {

+                        new FeedItem("", new Date(), "Video games are cool", "DESCRIPTION", "", "Randy", emptyList, "", "", ""),

+                        new FeedItem("", new Date(), "The new video game", "DESCRIPTION", "", "Camil", emptyList, "", "", ""),

+                        new FeedItem("", new Date(), "Best games of 2015", "DESCRIPTION", "", "Jos", emptyList, "", "", ""),

+                };

+

+        FeedItem[] dislikedItems = new FeedItem[]

+                {

+                        new FeedItem("", new Date(), "Video of a cat", "DESCRIPTION", "", "Randy", emptyList, "", "", ""),

+                        new FeedItem("", new Date(), "It's raining", "DESCRIPTION", "", "Joep", emptyList, "", "", ""),

+                        new FeedItem("", new Date(), "Shocking video of a cat in the rain.", "DESCRIPTION", "", "Joep", emptyList, "", "", ""),

+                };

+

+        FeedSorter s = new FeedSorter();

+

+        //I like games & I hate sports

+        trainNetwork(likedItems, dislikedItems, s);

+

+        FeedItem dislikedItem = new FeedItem("", new Date(2014, 1, 1, 1, 2, 1), "Another cool video of a cat in the sun.", "DESCRIPTION", "", "Randy", emptyList, "", "", "");

+        FeedItem likedItem = new FeedItem("", new Date(2014, 1, 1, 1, 1, 1), "Coolest retro games", "DESCRIPTION", "", "Jos", emptyList, "", "", "");

+

+        testSortingOrder(s, dislikedItem, likedItem);

+    }

+

+    public void testSortItemsByAuthor() throws Exception {

+        List<String> emptyList = new ArrayList<>();

+

+        FeedItem[] likedItems = new FeedItem[]

+                {

+                        new FeedItem("", new Date(), "Best games of 2015", "DESCRIPTION", "", "Jos", emptyList, "", "", ""),

+                        new FeedItem("", new Date(), "It's raining cats and dogs!", "DESCRIPTION", "", "Jos", emptyList, "", "", ""),

+                };

+

+        FeedItem[] dislikedItems = new FeedItem[]

+                {

+                        new FeedItem("", new Date(), "Video of a cat", "DESCRIPTION", "", "Randy", emptyList, "", "", ""),

+                        new FeedItem("", new Date(), "It's raining", "DESCRIPTION", "", "Joep", emptyList, "", "", ""),

+                        new FeedItem("", new Date(), "Shocking video of a cat in the rain.", "DESCRIPTION", "", "Joep", emptyList, "", "", ""),

+                        new FeedItem("", new Date(), "Video games are cool", "DESCRIPTION", "", "Randy", emptyList, "", "", ""),

+                        new FeedItem("", new Date(), "The new video game", "DESCRIPTION", "", "Camil", emptyList, "", "", ""),

+                };

+

+        FeedSorter s = new FeedSorter();

+

+        //I like games & I hate sports

+        trainNetwork(likedItems, dislikedItems, s);

+

+        FeedItem dislikedItem = new FeedItem("", new Date(2014, 1, 1, 1, 2, 1), "Another cool video of a cat in the sun.", "DESCRIPTION", "", "Randy", emptyList, "", "", "");

+        FeedItem likedItem = new FeedItem("", new Date(2014, 1, 1, 1, 1, 1), "Coolest retro games", "DESCRIPTION", "", "Jos", emptyList, "", "", "");

+

+        testSortingOrder(s, dislikedItem, likedItem);

+    }

+

+    private void testSortingOrder(FeedSorter s, FeedItem dislikedItem, FeedItem likedItem) {

         List<FeedItem> testItems = new LinkedList<>();

-        testItems.add(sportsItem);

-        testItems.add(gamesItem);

+        testItems.add(dislikedItem);

+        testItems.add(likedItem);

 

         List<FeedItem> sortedItems = s.sortItems(testItems);

-        Assert.assertEquals(sortedItems.get(0), gamesItem);

-        Assert.assertEquals(sortedItems.get(1), sportsItem);

+        Assert.assertEquals(sortedItems.get(0), likedItem);

+        Assert.assertEquals(sortedItems.get(1), dislikedItem);

+    }

+

+    private void trainNetwork(FeedItem[] likedItems, FeedItem[] dislikedItems, FeedSorter s) {

+        for(int i = 0; i < 200; i++) {

+            for (FeedItem item : likedItems) {

+                s.feedback(item, Feedback.Like);

+            }

+

+            for (FeedItem item : dislikedItems) {

+                s.feedback(item, Feedback.Dislike);

+            }

+        }

     }

 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/rssin/neurons/NeuralNetworkTest.java b/app/src/androidTest/java/org/rssin/neurons/NeuralNetworkTest.java
index b0f6eea..57776f3 100755
--- a/app/src/androidTest/java/org/rssin/neurons/NeuralNetworkTest.java
+++ b/app/src/androidTest/java/org/rssin/neurons/NeuralNetworkTest.java
@@ -7,12 +7,12 @@ public class NeuralNetworkTest extends TestCase {
 

     public void testAnd() throws Exception {

         MultiNeuralNetwork nn = new MultiNeuralNetwork(10, 2);

-        nn.addInput();

-        nn.addInput();

-        nn.addInput();

+        nn.addInput();//bias

+        nn.addInput();//inputA

+        nn.addInput();//inputB

 

         //Simple AND

-        for (int i = 0; i < 100; i++)

+        for (int i = 0; i < 300; i++)

         {

             PredictionInterface p1 = nn.computeOutput(new double[] {

                     1,

@@ -75,7 +75,7 @@ public class NeuralNetworkTest extends TestCase {
         nn.addInput();

 

         //Simple AND

-        for (int i = 0; i < 100; i++)

+        for (int i = 0; i < 300; i++)

         {

             PredictionInterface p1 = nn.computeOutput(new double[] {

                     1,