Merge branch 'iris-clasification' of s434734/AiForklift into master

magazine/static/magazine/forklift.js

@@ -1,68 +1,66 @@
 class Forklift {
-    constructor(x, y) {
-        this.positoin = createVector(x, y);
-        this.speed = 5;
-        this.path = [];
-        this.currentTarget = '';
-        this.targetId = 0;
-        this.velocity = createVector(0, 0);
-        this.direction = createVector(0, 0);
-        this.end = false;
-        this.currentSection = 0;
-    }
+  constructor(x, y) {
+    this.positoin = createVector(x, y);
+    this.speed = 5;
+    this.path = [];
+    this.currentTarget = '';
+    this.targetId = 0;
+    this.velocity = createVector(0, 0);
+    this.direction = createVector(0, 0);
+    this.end = false;
+    this.currentSection = 0;
+  }
 
-    draw() {
-        fill(225, 255, 0);
-        ellipse(this.positoin.x, this.positoin.y, 20);
-    }
+  draw() {
+    fill(225, 255, 0);
+    ellipse(this.positoin.x, this.positoin.y, 20);
+  }
 
-    setPath(path) {
-        this.end = false;
-        this.path = path;
-        this.currentTarget = this.path[this.targetId];
-        this.setVelocity();
-    }
+  setPath(path) {
+    this.end = false;
+    this.path = path;
+    this.currentTarget = this.path[this.targetId];
+    this.setVelocity();
+  }
 
-    nextTarget() {
-        this.targetId += 1;
-        if (this.targetId < this.path.length) {
-            this.currentTarget = this.path[this.targetId];
-        } else {
-            this.end = true;
-            this.targetId = 0;
-        }
+  nextTarget() {
+    this.targetId += 1;
+    if (this.targetId < this.path.length) {
+      this.currentTarget = this.path[this.targetId];
+    } else {
+      this.end = true;
+      this.targetId = 0;
     }
+  }
 
-    targetReached() {
-        this.currentSection = this.currentTarget;
-        return this.end;
-    }
+  targetReached() {
+    this.currentSection = this.currentTarget;
+    return this.end;
+  }
 
-    setVelocity() {
-        debugger;
-        this.direction = this.sub(sections[this.currentTarget], this.positoin);
-        this.velocity = this.direction.setMag(this.speed);
-    }
+  setVelocity() {
+    this.direction = this.sub(sections[this.currentTarget], this.positoin);
+    this.velocity = this.direction.setMag(this.speed);
+  }
 
-    move() {
-        this.positoin = this.add(this.positoin, this.velocity);
-        if (
-            Math.abs(this.positoin.x - sections[this.currentTarget].x) <=
-                this.speed &&
-            Math.abs(this.positoin.y - sections[this.currentTarget].y) <=
-                this.speed
-        ) {
-            this.positoin = sections[this.currentTarget];
-            this.nextTarget();
-            this.setVelocity();
-        }
+  move() {
+    this.positoin = this.add(this.positoin, this.velocity);
+    if (
+      Math.abs(this.positoin.x - sections[this.currentTarget].x) <=
+        this.speed &&
+      Math.abs(this.positoin.y - sections[this.currentTarget].y) <= this.speed
+    ) {
+      this.positoin = sections[this.currentTarget];
+      this.nextTarget();
+      this.setVelocity();
     }
+  }
 
-    sub(target, pos) {
-        return createVector(target.x - pos.x, target.y - pos.y);
-    }
+  sub(target, pos) {
+    return createVector(target.x - pos.x, target.y - pos.y);
+  }
 
-    add(target, pos) {
-        return createVector(target.x + pos.x, target.y + pos.y);
-    }
+  add(target, pos) {
+    return createVector(target.x + pos.x, target.y + pos.y);
+  }
 }

magazine/static/magazine/sketch.js

@@ -1,130 +1,149 @@
+const serverUrl = 'http://localhost:8000';
 let sections;
 let roads;
 let packageClaim;
 let going = false;
 let forklift;
 
-let target;
-
 // This runs once at start
 function setup() {
-    createCanvas(600, 600).parent('canvas');
+  createCanvas(600, 600).parent('canvas');
 
-    frameRate(30);
+  frameRate(30);
 
-    createMagazineLayout();
+  createMagazineLayout();
 
-    select('#button').mousePressed(deliver);
-    target = select('#target');
-    // Create a forklift instance
-    forklift = new Forklift(sections[0].x, sections[0].y);
+  select('#button').mousePressed(getIrisType);
+  sepalWidth = select('#sepalWidth');
+  sepalLength = select('#sepalLength');
+  petalWidth = select('#petalWidth');
+  petalLength = select('#petalLength');
+  // Create a forklift instance
+  forklift = new Forklift(sections[0].x, sections[0].y);
 }
 
 // This runs every frame
 function draw() {
-    background(64);
-    drawMagazine();
-    forklift.draw();
-    if (going) {
-        if (forklift.targetReached()) {
-            going = false;
-        } else {
-            forklift.move();
-        }
+  background(64);
+  drawMagazine();
+  forklift.draw();
+  if (going) {
+    if (forklift.targetReached()) {
+      going = false;
+    } else {
+      forklift.move();
     }
+  }
 }
 
 function drawMagazine() {
-    noFill();
-    stroke(220);
-    strokeWeight(10);
-    // Draw all the roads in the magazine
-    for (let road of roads) {
-        line(
-            sections[road[0]].x,
-            sections[road[0]].y,
-            sections[road[1]].x,
-            sections[road[1]].y,
-        );
-    }
-    noStroke();
-    textAlign(CENTER, CENTER);
-    // Draw all sections in the magazine
-    for (let section of Object.keys(sections)) {
-        if (section === 0) {
-            fill(80);
-            rect(sections[section].x - 15, sections[section].y, 30, 30);
-        } else {
-            fill(30);
-            ellipse(sections[section].x, sections[section].y, 30);
-            fill(255);
-            text(section, sections[section].x, sections[section].y);
-        }
+  noFill();
+  stroke(220);
+  strokeWeight(10);
+  // Draw all the roads in the magazine
+  for (let road of roads) {
+    line(
+      sections[road[0]].x,
+      sections[road[0]].y,
+      sections[road[1]].x,
+      sections[road[1]].y,
+    );
+  }
+  noStroke();
+  textAlign(CENTER, CENTER);
+  // Draw all sections in the magazine
+  for (let section of Object.keys(sections)) {
+    if (section === 0) {
+      fill(80);
+      rect(sections[section].x - 15, sections[section].y, 30, 30);
+    } else {
+      fill(30);
+      ellipse(sections[section].x, sections[section].y, 30);
+      fill(255);
+      text(section, sections[section].x, sections[section].y);
     }
+  }
 }
 
-function deliver() {
-    let data = {
-        graph: magazineToGraph(),
-        start_node: forklift.currentSection,
-        dest_node: int(target.value()),
-    };
-    httpPost(
-        'http://localhost:8000/shortestPath',
-        data,
-        response => {
-            path = response.split('').map(Number);
-            forklift.currentTarget = path[0];
-            forklift.setPath(path);
-            going = true;
-        },
-        error => {
-            console.log(error);
-        },
-    );
+function getIrisType() {
+  let sw = select('#sepalWidth').value();
+  let sl = select('#sepalLength').value();
+  let pw = select('#petalWidth').value();
+  let pl = select('#petalLength').value();
+  let data = {
+    sepalWidth: sw,
+    sepalLength: sl,
+    petalWidth: pw,
+    petalLength: pl,
+  };
+  httpPost(serverUrl + '/classify', data, response => {
+    deliver(response);
+  });
+}
+
+function deliver(targetSection) {
+  let data = {
+    graph: magazineToGraph(),
+    start_node: forklift.currentSection,
+    dest_node: int(targetSection),
+  };
+  console.log(data);
+  httpPost(
+    serverUrl + '/shortestPath',
+    data,
+    response => {
+      path = response.split('').map(Number);
+      forklift.currentTarget = path[0];
+      forklift.setPath(path);
+      going = true;
+    },
+    error => {
+      console.log(error);
+    },
+  );
 }
 
 function createMagazineLayout() {
-    unit = width / 6;
+  unit = width / 6;
 
-    sections = {
-        0: { x: 2 * unit, y: unit },
-        1: createVector(unit, 2 * unit),
-        2: createVector(unit, 3 * unit),
-        3: createVector(unit, 4 * unit),
-        4: createVector(3 * unit, 2 * unit),
-        5: createVector(3 * unit, 3 * unit),
-        6: createVector(3 * unit, 4 * unit),
-    };
-    roads = [
-        [1, 5],
-        [2, 3],
-        [0, 1],
-        [0, 4],
-        [4, 5],
-        [5, 6],
-        [3, 6],
-        [4, 2],
-        [5, 3],
-    ];
+  sections = {
+    0: { x: 2 * unit, y: unit },
+    1: createVector(unit, 2 * unit),
+    2: createVector(unit, 3 * unit),
+    3: createVector(unit, 4 * unit),
+    4: createVector(3 * unit, 2 * unit),
+    5: createVector(3 * unit, 3 * unit),
+    6: createVector(3 * unit, 4 * unit),
+  };
+  roads = [
+    [1, 5],
+    [2, 3],
+    [0, 1],
+    [0, 4],
+    [4, 5],
+    [5, 6],
+    [3, 6],
+    [4, 2],
+    [5, 3],
+  ];
 }
 
 function magazineToGraph() {
-    graph = {};
-    for (let key of Object.keys(sections)) {
-        graph[key] = {};
-    }
-    for (let road of roads) {
-        start = road[0];
-        end = road[1];
-        graph[start][end] = Math.sqrt(
-            Math.pow(sections[start].x - sections[end].x, 2) +
-                Math.pow(sections[start].y - sections[end].y, 2),
-        );
-        graph[end][start] = Math.sqrt(
-            Math.pow(sections[start].x - sections[end].x, 2) +
-                Math.pow(sections[start].y - sections[end].y, 2),
-        );
-    }
-    return graph;
+  graph = {};
+  for (let key of Object.keys(sections)) {
+    graph[key] = {};
+  }
+  for (let road of roads) {
+    start = road[0];
+    end = road[1];
+    graph[start][end] = Math.sqrt(
+      Math.pow(sections[start].x - sections[end].x, 2) +
+        Math.pow(sections[start].y - sections[end].y, 2),
+    );
+    graph[end][start] = Math.sqrt(
+      Math.pow(sections[start].x - sections[end].x, 2) +
+        Math.pow(sections[start].y - sections[end].y, 2),
+    );
+  }
+  return graph;
 }

magazine/templates/magazine/index.html

@@ -42,27 +42,21 @@
         <div class="package">
             <h3 style="margin-top: 0;">Package description</h1>
             <label for="width">Sepal Width</label>
-            <input type="number" name="width">
+            <input type="number" id="sepalWidth">
             <label for="topWidth">Sepal Length</label>
-            <input type="number" name="topWidth">
+            <input type="number" id="sepalLength">
             <label for="botWidth">Petal Width</label>
-            <input type="number" name="botWidth">
+            <input type="number" id="petalWidth">
             <label for="height">Petal Length</label>
-            <input type="number" name="height">
-            <label for="target">Target</label>
-            <input type="number" id="target" name="target">
+            <input type="number" id="petalLength">
             <button id="button">Send Package</button>
         </div>
         <div id="canvas" style="margin: 10px;"></div>
         <div class="legend">
             <h3 style="margin-top: 0">Sections</h3>
-            <p>A - Cartons</p>
-            <p>B - Barrels</p>
-            <p>C - Plastic boxes</p>
-            <p>D - ______</p>
-            <p>E - ______</p>
-            <p>F - ______</p>
-            <p>G - ______</p>
+            <p>1 - Setosa</p>
+            <p>2 - Versicolor</p>
+            <p>3 - Viginica</p>
         </div>
     </div>
 </body>

magazine/views.py

@@ -1,10 +1,11 @@
+import math
+import json
 from django.shortcuts import render
 from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_exempt
 
-import json
-import math
-
+import tensorflow as tf
+import numpy as np
 # Create your views here.
 
 
@@ -14,7 +15,21 @@ def index(request):
 
 @csrf_exempt
 def classify(request):
-    return HttpResponse(json.load(request))
+    loaded_request = json.load(request)
+    sw = loaded_request['sepalWidth']
+    sl = loaded_request['sepalLength']
+    pw = loaded_request['petalWidth']
+    pl = loaded_request['petalLength']
+
+    model = tf.keras.models.load_model('iris_model.h5')
+    output = model.predict(np.array([[sw, sl, pw, pl]]))
+    if output[0][0] > output[0][1] and output[0][0] > output[0][1]:
+        guess = 1
+    elif output[0][1] > output[0][0] and output[0][1] > output[0][2]:
+        guess = 2
+    else:
+        guess = 3
+    return HttpResponse(guess)
 
 
 @csrf_exempt
@@ -61,4 +76,6 @@ def shortestPath(request):
             current = predecessor[current]
         path[node] = p[::-1]
 
+    print(path)
+
     return HttpResponse(path[dest_node][1:])

train_model.py

@@ -0,0 +1,28 @@
+import numpy as np
+import tensorflow as tf
+
+from sklearn.datasets import load_iris
+from sklearn.model_selection import train_test_split
+
+from tensorflow.keras import layers
+from tensorflow.keras.utils import to_categorical
+
+# Getting data
+data_set = load_iris()
+x = data_set['data']
+y = to_categorical(data_set['target'])
+
+train_x, test_x, train_y, test_y = train_test_split(x, y, test_size=0.2)
+
+# Building the model
+model = tf.keras.Sequential()
+
+model.add(layers.Dense(8, activation='relu', input_dim=4))
+model.add(layers.Dense(3, activation='sigmoid'))
+
+model.compile(optimizer='adam', loss='categorical_crossentropy',
+              metrics=['accuracy'])
+# Training the model
+model.fit(train_x, train_y, validation_data=(test_x, test_y), epochs=2000)
+
+model.save('iris_model.h5')