s452639/psi
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'main' of https://git.wmi.amu.edu.pl/s452639/psi

Browse Source
This commit is contained in:
Marcin Czerniak 2021-06-21 12:04:49 +02:00
commit e2b2cf607f
4 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/img/shelves/FRIDGE_SHELF.svg Normal file
View File

@ -0,0 +1,16 @@
<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 100 100">
<g id="FRIDGE" transform="translate(330)">
<g id="Rectangle_1" data-name="Rectangle 1" transform="translate(-330)" fill="#00f8ff" stroke="#fff" stroke-width="3" opacity="0.05">
<rect width="100" height="100" stroke="none"/>
<rect x="1.5" y="1.5" width="97" height="97" fill="none"/>
</g>
<g id="Group_1" data-name="Group 1" opacity="0.26">
<path id="Path_1" data-name="Path 1" d="M-291.832,0l-30.122,97.125h35.735L-254.952,0Z" transform="translate(0 1.489)" fill="#fff"/>
<path id="Path_2" data-name="Path 2" d="M-291.832,0l-30.122,97.125h12.5L-278.191,0Z" transform="translate(45 1.489)" fill="#fff"/>
</g>
<g id="Rectangle_2" data-name="Rectangle 2" transform="translate(-330)" fill="none" stroke="#fff" stroke-width="4">
<rect width="100" height="100" stroke="none"/>
<rect x="2" y="2" width="96" height="96" fill="none"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 995 B

13
src/logic/evolution.js
View File

@ -9,6 +9,7 @@ class Evolution extends Arrangement {
this.setup(); this.setup();
this.productIndex = 0; this.productIndex = 0;
this.productsAmount = [...Array(ShelfCount)].map(() => 0); this.productsAmount = [...Array(ShelfCount)].map(() => 0);
this.backlog = []
} }
generate() { generate() {
@ -77,7 +78,19 @@ class Evolution extends Arrangement {
} }
} }
addCustomJobRequest(productName, amount, x, y) {
this.backlog.push({
product: productName,
amount,
x, y
});
}
getJobRequest() { getJobRequest() {
if (this.backlog.length > 0) {
return this.backlog.pop()
}
if (this.productIndex > ShelfCount) if (this.productIndex > ShelfCount)
return null; return null;

2
src/neural_network.py
View File

@ -130,7 +130,7 @@ def testing(n, testingSamples, testingLabels):
print('Performance', scorecardArray.sum() / scorecardArray.size) print('Performance', scorecardArray.sum() / scorecardArray.size)
testing(digitNetwork,dig_test_images,dig_test_labels) testing(digitNetwork,dig_test_images,dig_test_labels)
testing(letterNetwork,let_test_images,let_test_labels)
li = [] li = []
ourOwnDataset = [] ourOwnDataset = []

9
src/view/ordersView.js
View File

@ -3,7 +3,6 @@ class OrdersView {
constructor() { constructor() {
OrdersView.instance = this; OrdersView.instance = this;
this.orders = [];
this.lastRecognizedText = ''; this.lastRecognizedText = '';
this.addMultipleCanvases(10); this.addMultipleCanvases(10);
@ -134,7 +133,7 @@ class OrdersView {
const text = str.substring(0, str.length - 2); const text = str.substring(0, str.length - 2);
const number = parseInt(numberStr); const number = parseInt(numberStr);
this.orders.push({ Products.instance.addCustomJobRequest({
product: Product.REGISTRY[text], product: Product.REGISTRY[text],
amount: number, amount: number,
x: 11, x: 11,
@ -143,10 +142,4 @@ class OrdersView {
this.closeWindow(); this.closeWindow();
} }
getOrder() {
if (!this.orders.length) return null;
return this.orders.shift();
}
} }