VSAG/vision_sjtu_19
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into new

Browse Source
This commit is contained in:
xinyang
2019-05-04 14:06:04 +08:00
committed by GitHub
parent 99a771da90 37f6da5dd6
commit 6d115ca43c
2 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main.cpp
View File

@@ -53,7 +53,7 @@ int main(int argc, char *argv[]){
WrapperHead *video_energy;
if (from_camera) {
video_armor = new CameraWrapper(0);
// video_energy = new CameraWrapper(1);
video_energy = new CameraWrapper(1);
} else {
video_armor = new VideoWrapper("/home/xinyang/Desktop/Video.mp4");
video_energy = new VideoWrapper("/home/xinyang/Desktop/Video.mp4");
@@ -63,7 +63,6 @@ int main(int argc, char *argv[]){
}
Mat energy_src, armor_src;
ArmorFinder armorFinder(ENEMY_BLUE, uart, PROJECT_DIR"/tools/para/");
Energy energy(uart);
@@ -74,17 +73,20 @@ int main(int argc, char *argv[]){
while (ok) {
CNT_TIME(WORD_LIGHT_CYAN, "Total", {
ok = video_armor->read(energy_src) && video_armor->read(armor_src);
if (show_origin) {
imshow("enery src", energy_src);
imshow("armor src", armor_src);
}
if (state == ENERGY_STATE) {
ok = video_energy->read(energy_src);
if (show_origin) {
imshow("energy src", energy_src);
}
if (from_camera == 0) {
energy.extract(energy_src);
}
energy.run(energy_src);
} else {
ok = video_armor->read(armor_src);
if (show_origin) {
imshow("armor src", armor_src);
}
CNT_TIME(WORD_LIGHT_BLUE, "Armor Time", {
armorFinder.run(armor_src);
});

2
tools/TrainCNN/forward.py
View File

@@ -41,7 +41,7 @@ CONV2_OUTPUT_CHANNELS = 10
FC1_OUTPUT_NODES = 16
# 第二层全连接宽度（输出标签类型数）
FC2_OUTPUT_NODES = 6
FC2_OUTPUT_NODES = 8
# 输出标签类型数
OUTPUT_NODES = FC2_OUTPUT_NODES