atria-soft/dollar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: atria-soft:63ecc46b10dcfb9e9949bee0765abdb693cbfa3b
Branches Tags
atria-soft:main
..
compare: atria-soft:ecc7bf08f3afa797a0aa7ffa08d7d50698b0172d
Branches Tags
atria-soft:main

No commits in common. "63ecc46b10dcfb9e9949bee0765abdb693cbfa3b" and "ecc7bf08f3afa797a0aa7ffa08d7d50698b0172d" have entirely different histories.
63ecc46b10 ... ecc7bf08f3

24 changed files with 127 additions and 169 deletions
Show Stats Expand all files Collapse all files

14
dollar/Engine.cpp
View File

@ -8,10 +8,10 @@
#include <dollar/debug.hpp>
#include <dollar/Rectangle.hpp>
#include <dollar/tools.hpp>
#include <etk/os/FSNode.hpp>
#include <dollar/EngineN.hpp>
#include <dollar/EngineP.hpp>
#include <dollar/EnginePPlus.hpp>
#include <etk/path/fileSystem.hpp>
dollar::Engine::Engine():
@ -28,14 +28,12 @@ size_t dollar::Engine::getNumberResult() {
}
bool dollar::Engine::loadPath(const etk::Uri& _uri) {
DOLLAR_INFO("Load Path: " << _uri);
etk::Vector<etk::Uri> files = etk::uri::list(_uri);
bool dollar::Engine::loadPath(const etk::String& _path) {
DOLLAR_INFO("Load Path: " << _path);
etk::FSNode path(_path);
etk::Vector<etk::String> files = path.folderGetSub(false, true, "*.json");
for (auto &it : files) {
if (etk::uri::isFile(it) == false) {
continue;
}
if (it.getPath().getExtention().toLower() == "json") {
if (etk::end_with(it, ".json") == true) {
loadGesture(it);
}
}

4
dollar/Engine.hpp
View File

@ -32,8 +32,8 @@ namespace dollar {
protected:
virtual dollar::Results recognize2(const etk::Vector<etk::Vector<vec2>>& _paths) = 0;
public:
virtual bool loadPath(const etk::Uri& _uri);
virtual bool loadGesture(const etk::Uri& _uri) = 0;
virtual bool loadPath(const etk::String& _path);
virtual bool loadGesture(const etk::String& _filename) = 0;
virtual void addGesture(ememory::SharedPtr<dollar::Gesture> _gesture) = 0;
};

7
dollar/EngineN.cpp
View File

@ -8,6 +8,7 @@
#include <dollar/debug.hpp>
#include <dollar/Rectangle.hpp>
#include <dollar/tools.hpp>
#include <etk/os/FSNode.hpp>
#include <cmath>
#include <algorithm>
@ -137,10 +138,10 @@ void dollar::EngineN::setRotationInvariance(bool _ignoreRotation) {
}
}
bool dollar::EngineN::loadGesture(const etk::Uri& _uri) {
bool dollar::EngineN::loadGesture(const etk::String& _filename) {
ememory::SharedPtr<dollar::Gesture> ref = ememory::makeShared<dollar::GestureN>();
DOLLAR_DEBUG("Load Gesture: " << _uri);
if (ref->load(_uri) == true) {
DOLLAR_DEBUG("Load Gesture: " << _filename);
if (ref->load(_filename) == true) {
addGesture(ref);
return true;
}

2
dollar/EngineN.hpp
View File

@ -34,7 +34,7 @@ namespace dollar {
public:
EngineN(bool _protractor);
dollar::Results recognize2(const etk::Vector<etk::Vector<vec2>>& _points) override;
bool loadGesture(const etk::Uri& _uri) override;
bool loadGesture(const etk::String& _filename) override;
void addGesture(ememory::SharedPtr<dollar::Gesture> _gesture) override;
protected:
float distanceAtBestAngle(const etk::Vector<vec2>& _points, const etk::Vector<vec2>& _reference);

7
dollar/EngineP.cpp
View File

@ -8,6 +8,7 @@
#include <dollar/debug.hpp>
#include <dollar/Rectangle.hpp>
#include <dollar/tools.hpp>
#include <etk/os/FSNode.hpp>
#include <cmath>
#include <algorithm>
#define MAX_FLOAT std::numeric_limits<float>::max()
@ -100,10 +101,10 @@ static float calculateBestDistance(const etk::Vector<vec2>& _points, const etk::
}
bool dollar::EngineP::loadGesture(const etk::Uri& _uri) {
bool dollar::EngineP::loadGesture(const etk::String& _filename) {
ememory::SharedPtr<dollar::Gesture> ref = ememory::makeShared<dollar::GestureP>();
DOLLAR_DEBUG("Load Gesture: " << _uri);
if (ref->load(_uri) == true) {
DOLLAR_DEBUG("Load Gesture: " << _filename);
if (ref->load(_filename) == true) {
addGesture(ref);
return true;
}

2
dollar/EngineP.hpp
View File

@ -31,7 +31,7 @@ namespace dollar {
public:
EngineP();
dollar::Results recognize2(const etk::Vector<etk::Vector<vec2>>& _paths) override;
bool loadGesture(const etk::Uri& _uri) override;
bool loadGesture(const etk::String& _filename) override;
void addGesture(ememory::SharedPtr<dollar::Gesture> _gesture) override;
};
}

18
dollar/EnginePPlus.cpp
View File

@ -8,6 +8,7 @@
#include <dollar/debug.hpp>
#include <dollar/Rectangle.hpp>
#include <dollar/tools.hpp>
#include <etk/os/FSNode.hpp>
#include <cmath>
#include <algorithm>
@ -232,10 +233,10 @@ float dollar::EnginePPlus::calculatePPlusDistance(const etk::Vector<vec2>& _poin
bool dollar::EnginePPlus::loadGesture(const etk::Uri& _uri) {
bool dollar::EnginePPlus::loadGesture(const etk::String& _filename) {
ememory::SharedPtr<dollar::Gesture> ref = ememory::makeShared<dollar::GesturePPlus>();
DOLLAR_DEBUG("Load Gesture: " << _uri);
if (ref->load(_uri) == true) {
DOLLAR_DEBUG("Load Gesture: " << _filename);
if (ref->load(_filename) == true) {
addGesture(ref);
return true;
}
@ -250,7 +251,7 @@ void dollar::EnginePPlus::addGesture(ememory::SharedPtr<dollar::Gesture> _gestur
}
}
static void storeSVG(const etk::Uri& _fileName,
static void storeSVG(const etk::String& _fileName,
const ememory::SharedPtr<dollar::GesturePPlus>& _gesture,
const etk::Vector<etk::Vector<vec2>>& _strokes,
const etk::Vector<vec2>& _points,
@ -304,14 +305,7 @@ static void storeSVG(const etk::Uri& _fileName,
data += " />\n";
}
data += "</svg>\n";
{
ememory::SharedPtr<etk::io::Interface> fileIO = etk::uri::get(_fileName);
if (fileIO->open(etk::io::OpenMode::Write) == false) {
return;
}
fileIO->writeAll(data);
fileIO->close();
}
etk::FSNodeWriteAllData(_fileName, data);
}

2
dollar/EnginePPlus.hpp
View File

@ -52,7 +52,7 @@ namespace dollar {
public:
EnginePPlus();
dollar::Results recognize2(const etk::Vector<etk::Vector<vec2>>& _paths) override;
bool loadGesture(const etk::Uri& _uri) override;
bool loadGesture(const etk::String& _filename) override;
void addGesture(ememory::SharedPtr<dollar::Gesture> _gesture) override;
protected:
float calculatePPlusDistance(const etk::Vector<vec2>& _points,

41
dollar/Gesture.cpp
View File

@ -7,7 +7,7 @@
#include <dollar/debug.hpp>
#include <dollar/Gesture.hpp>
#include <dollar/tools.hpp>
#include <etk/uri/uri.hpp>
#include <etk/os/FSNode.hpp>
#include <ejson/ejson.hpp>
#include <esvg/esvg.hpp>
#include <etk/stdTools.hpp>
@ -35,7 +35,7 @@ static etk::Vector<etk::Vector<vec2>> loadPointsJson(const ejson::Document& _doc
return out;
}
etk::Vector<etk::Vector<vec2>> dollar::loadPoints(const etk::Uri& _fileName, etk::String* _label, etk::String* _type) {
etk::Vector<etk::Vector<vec2>> dollar::loadPoints(const etk::String& _fileName, etk::String* _label, etk::String* _type) {
ejson::Document doc;
doc.load(_fileName);
if (_label != null) {
@ -70,11 +70,11 @@ dollar::Gesture::Gesture():
}
bool dollar::Gesture::load(const etk::Uri& _fileName) {
etk::String extention = etk::toLower(_fileName.getPath().getExtention());
if (extention == "json") {
bool dollar::Gesture::load(const etk::String& _fileName) {
etk::String tmpName = etk::toLower(_fileName);
if (etk::end_with(tmpName, ".json") == true) {
return loadJSON(_fileName);
} else if (extention == "svg") {
} else if (etk::end_with(tmpName, ".svg") == true) {
return loadSVG(_fileName);
}
DOLLAR_ERROR("Un-sopported LOAD extention : " << _fileName);
@ -82,7 +82,7 @@ bool dollar::Gesture::load(const etk::Uri& _fileName) {
return false;
}
bool dollar::Gesture::loadJSON(const etk::Uri& _fileName) {
bool dollar::Gesture::loadJSON(const etk::String& _fileName) {
ejson::Document doc;
doc.load(_fileName);
if (doc["type"].toString().get() != "REFERENCE") {
@ -96,10 +96,12 @@ bool dollar::Gesture::loadJSON(const etk::Uri& _fileName) {
return true;
}
bool dollar::Gesture::loadSVG(const etk::Uri& _fileName) {
bool dollar::Gesture::loadSVG(const etk::String& _fileName) {
esvg::Document doc;
doc.load(_fileName);
etk::Vector<etk::String> plop = etk::split(_fileName.getPath().getFileName(), '_');
etk::Vector<etk::String> plop = etk::split(_fileName, '.');
plop = etk::split(plop[plop.size() -2], '/');
plop = etk::split(plop[plop.size() -1], '_');
m_name = plop[0];
m_subId = etk::string_to_int32_t(plop[1]);
m_path = doc.getLines();
@ -114,12 +116,12 @@ bool dollar::Gesture::loadSVG(const etk::Uri& _fileName) {
}
bool dollar::Gesture::store(const etk::Uri& _fileName) {
etk::String extention = etk::toLower(_fileName.getPath().getExtention());
if (extention == "json") {
bool dollar::Gesture::store(const etk::String& _fileName) {
etk::String tmpName = etk::toLower(_fileName);
if (etk::end_with(tmpName, ".json") == true) {
storeJSON(_fileName);
return true;
} else if (extention == "svg") {
} else if (etk::end_with(tmpName, ".svg") == true) {
storeSVG(_fileName);
return true;
}
@ -128,7 +130,7 @@ bool dollar::Gesture::store(const etk::Uri& _fileName) {
return false;
}
void dollar::Gesture::storeJSON(const etk::Uri& _fileName) {
void dollar::Gesture::storeJSON(const etk::String& _fileName) {
ejson::Document doc;
doc.add("type", ejson::String("REFERENCE"));
doc.add("value", ejson::String(m_name));
@ -149,7 +151,7 @@ void dollar::Gesture::storeJSON(const etk::Uri& _fileName) {
doc.store(_fileName);
}
void dollar::Gesture::storeSVG(const etk::Uri& _fileName, bool _storeDot) {
void dollar::Gesture::storeSVG(const etk::String& _fileName, bool _storeDot) {
etk::Vector<etk::Vector<vec2>> strokes = dollar::scaleToOne(m_path, true);
etk::String data("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
data += "<svg height=\"100\" width=\"100\">\n";
@ -175,14 +177,7 @@ void dollar::Gesture::storeSVG(const etk::Uri& _fileName, bool _storeDot) {
*/
}
data += "</svg>\n";
{
ememory::SharedPtr<etk::io::Interface> fileIO = etk::uri::get(_fileName);
if (fileIO->open(etk::io::OpenMode::Write) == false) {
return;
}
fileIO->writeAll(data);
fileIO->close();
}
etk::FSNodeWriteAllData(_fileName, data);
}
void dollar::Gesture::set(const etk::String& _name, uint32_t _subId, etk::Vector<etk::Vector<vec2>> _path) {

15
dollar/Gesture.hpp
View File

@ -8,7 +8,6 @@
#include <etk/math/Vector2D.hpp>
#include <ememory/memory.hpp>
#include <etk/uri/uri.hpp>
#include <etk/String.hpp>
namespace dollar {
@ -27,14 +26,14 @@ namespace dollar {
float getKeepAspectRatio() {
return m_aspectRatio;
}
bool load(const etk::Uri& _filename);
bool store(const etk::Uri& _filename);
bool load(const etk::String& _filename);
bool store(const etk::String& _filename);
void set(const etk::String& _name, uint32_t _subId, etk::Vector<etk::Vector<vec2>> _path);
protected:
bool loadJSON(const etk::Uri& _filename);
bool loadSVG(const etk::Uri& _filename);
void storeJSON(const etk::Uri& _filename);
void storeSVG(const etk::Uri& _filename, bool _storeDot=false);
bool loadJSON(const etk::String& _filename);
bool loadSVG(const etk::String& _filename);
void storeJSON(const etk::String& _filename);
void storeSVG(const etk::String& _filename, bool _storeDot=false);
public:
const etk::String& getName() {
return m_name;
@ -47,5 +46,5 @@ namespace dollar {
* @brief Load all point from a specific file
*
*/
etk::Vector<etk::Vector<vec2>> loadPoints(const etk::Uri& _fileName, etk::String* _label=null, etk::String* _type=null);
etk::Vector<etk::Vector<vec2>> loadPoints(const etk::String& _fileName, etk::String* _label=null, etk::String* _type=null);
}

1
dollar/GestureN.cpp
View File

@ -7,6 +7,7 @@
#include <dollar/debug.hpp>
#include <dollar/GestureN.hpp>
#include <dollar/tools.hpp>
#include <etk/os/FSNode.hpp>
#include <ejson/ejson.hpp>
#include <esvg/esvg.hpp>
#include <etk/stdTools.hpp>

1
dollar/GestureP.cpp
View File

@ -7,6 +7,7 @@
#include <dollar/debug.hpp>
#include <dollar/GestureP.hpp>
#include <dollar/tools.hpp>
#include <etk/os/FSNode.hpp>
#include <ejson/ejson.hpp>
#include <esvg/esvg.hpp>
#include <etk/stdTools.hpp>

1
dollar/GesturePPlus.cpp
View File

@ -7,6 +7,7 @@
#include <dollar/debug.hpp>
#include <dollar/GesturePPlus.hpp>
#include <dollar/tools.hpp>
#include <etk/os/FSNode.hpp>
#include <ejson/ejson.hpp>
#include <esvg/esvg.hpp>
#include <etk/stdTools.hpp>

2
lutin_dollar-bench-corpus.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.debug as debug
import lutin.tools as tools

2
lutin_dollar-converter.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.debug as debug
import lutin.tools as tools

2
lutin_dollar-data.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.debug as debug
import lutin.tools as tools

2
lutin_dollar-generate-form.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.debug as debug
import lutin.tools as tools

2
lutin_dollar-test.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.debug as debug
import lutin.tools as tools

2
lutin_dollar.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.debug as debug
import lutin.tools as tools

26
test/main.cpp
View File

@ -20,7 +20,7 @@ int main(int _argc, const char *_argv[]) {
TEST(TestAll, plop) {
/*
dollar::Gesture gest;
gest.set("test", 55, dollar::loadPoints("DATA:///test/P.json"));
gest.set("test", 55, dollar::loadPoints("DATA:test/P.json"));
gest.configure(0.1, 64, false, 0.1f);
*/
}
@ -30,8 +30,8 @@ TEST(TestAll, plop) {
*/
TEST(TestAll, singleStroke_normal) {
ememory::SharedPtr<dollar::Engine> reco = dollar::createEngine("$N");
reco->loadPath("DATA:///figure");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:///test/arrow.json"));
reco->loadPath("DATA:figure");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:test/arrow.json"));
EXPECT_EQ(res.haveMatch(), true);
if (res.haveMatch() == false) {
TEST_INFO(" Recognise noting ...");
@ -46,8 +46,8 @@ TEST(TestAll, singleStroke_normal) {
TEST(TestAll, singleStroke_protractor) {
ememory::SharedPtr<dollar::Engine> reco = dollar::createEngine("$N");
reco->loadPath("DATA:///figure");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:///test/arrow.json"));
reco->loadPath("DATA:figure");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:test/arrow.json"));
EXPECT_EQ(res.haveMatch(), true);
if (res.haveMatch() == false) {
TEST_INFO(" Recognise noting ...");
@ -66,8 +66,8 @@ TEST(TestAll, singleStroke_protractor) {
*/
TEST(TestAll, multiStroke_normal) {
ememory::SharedPtr<dollar::Engine> reco = dollar::createEngine("$N");
reco->loadPath("DATA:///text");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:///test/P.json"));
reco->loadPath("DATA:text");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:test/P.json"));
EXPECT_EQ(res.haveMatch(), true);
if (res.haveMatch() == false) {
TEST_INFO(" Recognise noting ...");
@ -82,8 +82,8 @@ TEST(TestAll, multiStroke_normal) {
TEST(TestAll, multiStroke_protractor) {
ememory::SharedPtr<dollar::Engine> reco = dollar::createEngine("$N-protractor");
reco->loadPath("DATA:///text");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:///test/P.json"));
reco->loadPath("DATA:text");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:test/P.json"));
EXPECT_EQ(res.haveMatch(), true);
if (res.haveMatch() == false) {
TEST_INFO(" Recognise noting ...");
@ -100,8 +100,8 @@ TEST(TestAll, multiStroke_protractor) {
*/
TEST(TestAll, multiStroke_point) {
ememory::SharedPtr<dollar::Engine> reco = dollar::createEngine("$P");
reco->loadPath("DATA:///text");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:///test/P.json"));
reco->loadPath("DATA:text");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:test/P.json"));
EXPECT_EQ(res.haveMatch(), true);
if (res.haveMatch() == false) {
TEST_INFO(" Recognise noting ...");
@ -118,8 +118,8 @@ TEST(TestAll, multiStroke_point) {
*/
TEST(TestAll, multiStroke_pointPlus) {
ememory::SharedPtr<dollar::Engine> reco = dollar::createEngine("$P+");
reco->loadPath("DATA:///text");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:///test/P.json"));
reco->loadPath("DATA:text");
dollar::Results res = reco->recognize(dollar::loadPoints("DATA:test/P.json"));
EXPECT_EQ(res.haveMatch(), true);
if (res.haveMatch() == false) {
TEST_INFO(" Recognise noting ...");

49
tool/bench-corpus/main.cpp
View File

@ -10,6 +10,7 @@
#include <etk/etk.hpp>
#include <test-debug/debug.hpp>
#include <etk/os/FSNode.hpp>
#include <etk/Map.hpp>
static bool keepAspectRatio = false;
@ -35,14 +36,14 @@ void usage(const etk::String& _progName) {
TEST_PRINT(" corpus_path Path of the corpus files");
}
bool testCorpus(const etk::Uri& _srcGesture, const etk::Uri& _srcCorpus);
bool testCorpus(const etk::String& _srcGesture, const etk::String& _srcCorpus);
int main(int _argc, const char *_argv[]) {
// init etk log system and file interface:
etk::init(_argc, _argv);
etk::Path srcGesture;
etk::Path srcCorpus;
etk::String srcGesture;
etk::String srcCorpus;
for (int32_t iii=1; iii<_argc; ++iii) {
etk::String arg = _argv[iii];
if ( arg == "-h"
@ -109,7 +110,7 @@ int main(int _argc, const char *_argv[]) {
return testCorpus(srcGesture, srcCorpus);
}
void generateFile(const etk::Uri& _fileName, const etk::Vector<etk::Uri>& _list) {
void generateFile(const etk::String& _fileName, const etk::Vector<etk::String>& _list) {
etk::String data("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
data += "<svg height=\"100\" width=\"100\">\n";
for (auto &itFile : _list) {
@ -130,17 +131,10 @@ void generateFile(const etk::Uri& _fileName, const etk::Vector<etk::Uri>& _list)
}
}
data += "</svg>\n";
{
ememory::SharedPtr<etk::io::Interface> fileIO = etk::uri::get(_fileName);
if (fileIO->open(etk::io::OpenMode::Write) == false) {
return;
}
fileIO->writeAll(data);
fileIO->close();
}
etk::FSNodeWriteAllData(_fileName, data);
}
void annalyseResult(etk::Map<etk::String, etk::Vector<etk::Pair<dollar::Results, etk::Uri>>>& _result) {
void annalyseResult(etk::Map<etk::String, etk::Vector<etk::Pair<dollar::Results, etk::String>>>& _result) {
TEST_PRINT("Full results:");
for (auto &it : _result) {
int32_t nbRecognise = 0;
@ -150,8 +144,8 @@ void annalyseResult(etk::Map<etk::String, etk::Vector<etk::Pair<dollar::Results,
if (etk::split(it.first, ' ').size() > 1) {
type = etk::split(it.first, ' ')[1];
}
etk::Vector<etk::Uri> listFull;
etk::Vector<etk::Uri> listWrong;
etk::Vector<etk::String> listFull;
etk::Vector<etk::String> listWrong;
etk::Map<etk::String, int32_t> wrongValues;
for (auto itRes : it.second) {
nbtested ++;
@ -180,16 +174,16 @@ void annalyseResult(etk::Map<etk::String, etk::Vector<etk::Pair<dollar::Results,
TEST_WARNING(" " << it.first << " " << it.second << "");
}
}
generateFile(etk::Path("out_dollar") / "bench-corpus" / "OK" / label + "_" + type + ".svg", listFull);
generateFile("out_dollar/bench-corpus/OK/" + label + "_" + type + ".svg", listFull);
if (listWrong.size() != 0) {
generateFile(etk::Path("out_dollar") / "bench-corpus" / "ERROR" / label + "_" + type + "_ERROR.svg", listWrong);
generateFile("out_dollar/bench-corpus/ERROR/" + label + "_" + type + "_ERROR.svg", listWrong);
} else {
etk::uri::remove(etk::Path("out_dollar") / "bench-corpus" / "ERROR" / label + "_" + type + "_ERROR.svg");
etk::FSNodeRemove("out_dollar/bench-corpus/ERROR/" + label + "_" + type + "_ERROR.svg");
}
}
}
bool testCorpus(const etk::Uri& _srcGesture, const etk::Uri& _srcCorpus) {
bool testCorpus(const etk::String& _srcGesture, const etk::String& _srcCorpus) {
// declare a Gesture (internal API)
dollar::EnginePPlus reco;
reco.setScaleKeepRatio(keepAspectRatio);
@ -207,22 +201,14 @@ bool testCorpus(const etk::Uri& _srcGesture, const etk::Uri& _srcCorpus) {
return -1;
}
TEST_DEBUG("List all file in the corpus path");
etk::Vector<etk::Uri> filesTmp = etk::uri::list(_srcCorpus);
etk::Vector<etk::Uri> files;
for (auto &it: filesTmp) {
if (etk::uri::isFile(it) == false) {
continue;
}
if (it.getPath().getExtention().toLower() == "json") {
files.pushBack(it);
}
}
etk::FSNode path(_srcCorpus);
etk::Vector<etk::String> files = path.folderGetSub(false, true, "*.json");
TEST_PRINT("---------------------------------------------------------------------------");
TEST_PRINT("-- test gestures: ");
TEST_PRINT("---------------------------------------------------------------------------");
// "label_type" ==> list of (result, file test name)
etk::Map<etk::String, etk::Vector<etk::Pair<dollar::Results, etk::Uri>>> agregateResults;
etk::Map<etk::String, etk::Vector<etk::Pair<dollar::Results, etk::String>>> agregateResults;
int32_t nbRecognise = 0;
int32_t nbRecognise2 = 0;
int32_t nbtested = 0;
@ -234,7 +220,8 @@ bool testCorpus(const etk::Uri& _srcGesture, const etk::Uri& _srcCorpus) {
//continue; // rejest for now ...
}
nbtested++;
etk::String filename = it.getPath().getFileName();
etk::Vector<etk::String> path = etk::split(it, '/');
etk::String filename = path[path.size()-1];
TEST_PRINT("Test '" << label << "' type=" << type << " " << filename);
dollar::Results res = reco.recognize(listPoints);

59
tool/generate-form/main.cpp
View File

@ -8,6 +8,7 @@
#include <dollar/tools.hpp>
#include <etk/etk.hpp>
#include <test-debug/debug.hpp>
#include <etk/os/FSNode.hpp>
#include <iostream>
#include <etk/Map.hpp>
@ -43,13 +44,13 @@ void usage(const etk::String& _progName) {
TEST_PRINT(" example:");
}
bool testCorpus(const etk::Uri& _srcCorpus);
bool testCorpus(const etk::String& _srcCorpus);
int main(int _argc, const char *_argv[]) {
// init etk log system and file interface:
etk::init(_argc, _argv);
etk::Path srcCorpus;
etk::String srcCorpus;
for (int32_t iii=1; iii<_argc; ++iii) {
etk::String arg = _argv[iii];
@ -118,7 +119,7 @@ int main(int _argc, const char *_argv[]) {
return testCorpus(srcCorpus);
}
void generateFile(const etk::Uri& _fileName, const etk::Vector<etk::Uri>& _list, const etk::Uri& _refName) {
void generateFile(const etk::String& _fileName, const etk::Vector<etk::String>& _list, const etk::String& _refName) {
TEST_PRINT(" " << _fileName);
etk::String data("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
data += "<svg height=\"100\" width=\"100\">\n";
@ -163,38 +164,24 @@ void generateFile(const etk::Uri& _fileName, const etk::Vector<etk::Uri>& _list,
}
}
data += "</svg>\n";
{
ememory::SharedPtr<etk::io::Interface> fileIO = etk::uri::get(_fileName);
if (fileIO->open(etk::io::OpenMode::Write) == false) {
return;
}
fileIO->writeAll(data);
fileIO->close();
}
etk::FSNodeWriteAllData(_fileName, data);
}
#define OUT_OF_RANGE (999999.0f)
bool testCorpus(const etk::Uri& _srcCorpus) {
bool testCorpus(const etk::String& _srcCorpus) {
TEST_PRINT("---------------------------------------------------------------------------");
TEST_PRINT("-- Create list of files: " << _srcCorpus);
TEST_PRINT("---------------------------------------------------------------------------");
etk::Vector<etk::Uri> filesTmp = etk::uri::list(_srcCorpus);
etk::Vector<etk::Uri> files;
for (auto &it: filesTmp) {
if (etk::uri::isFile(it) == false) {
continue;
}
if (it.getPath().getExtention().toLower() == "json") {
files.pushBack(it);
}
}
etk::FSNode path(_srcCorpus);
etk::Vector<etk::String> files = path.folderGetSub(false, true, "*.json");
TEST_PRINT("corpus have " << files.size() << " files");
etk::Vector<etk::String> listOfElementInCorpus;
for (auto &it : files) {
if (it.getPath().getExtention().toLower() == "json") {
etk::String elemName = etk::split(it.getPath().getFileName(),'_')[0];
if (etk::end_with(it, ".json") == true) {
etk::Vector<etk::String> path = etk::split(it, '/');
etk::String elemName = etk::split(path[path.size()-1],'_')[0];
if (elemName == "slash") {
elemName = "/";
}if (elemName == "back-slash") {
@ -209,7 +196,7 @@ bool testCorpus(const etk::Uri& _srcCorpus) {
}
}
// remove generation path ...
etk::uri::remove(etk::Path("out_dollar/generate-form"));
etk::FSNodeRemove("out_dollar/generate-form");
//listOfElementInCorpus.clear();
//listOfElementInCorpus.pushBack("slash");
@ -220,7 +207,7 @@ bool testCorpus(const etk::Uri& _srcCorpus) {
TEST_PRINT("---------------------------------------------------------------------------");
TEST_PRINT("-- Generate FOR: '" << itTypeOfCorpus << "'");
TEST_PRINT("---------------------------------------------------------------------------");
etk::Vector<etk::Uri> fileFiltered;
etk::Vector<etk::String> fileFiltered;
etk::String fileNameIt = itTypeOfCorpus;
if (fileNameIt == "/") {
fileNameIt = "slash";
@ -228,8 +215,9 @@ bool testCorpus(const etk::Uri& _srcCorpus) {
fileNameIt = "back-slash";
}
for (auto &it : files) {
if (it.getPath().getExtention().toLower() == "json") {
etk::String filename = it.getPath().getFileName();
if (etk::end_with(it, ".json") == true) {
etk::Vector<etk::String> path = etk::split(it, '/');
etk::String filename = path[path.size()-1];
if (etk::start_with(filename, fileNameIt + "_") == true) {
fileFiltered.pushBack(it);
}
@ -251,11 +239,11 @@ bool testCorpus(const etk::Uri& _srcCorpus) {
itTypeOfCorpusFileName = "question";
}
{
etk::Vector<etk::Uri> listPath;
etk::Vector<etk::String> listPath;
for (size_t iii=0; iii<fileFiltered.size(); ++iii) {
listPath.pushBack(fileFiltered[iii]);
}
generateFile(etk::Path("out_dollar") / "generate-form" / "pre_generate" / itTypeOfCorpusFileName + "_FULL.svg", listPath, "");
generateFile("out_dollar/generate-form/pre_generate/" + itTypeOfCorpusFileName + "_FULL.svg", listPath, "");
}
for (size_t iii=0; iii<fileFiltered.size(); ++iii) {
ememory::SharedPtr<dollar::GesturePPlus> gest = ememory::makeShared<dollar::GesturePPlus>();
@ -269,7 +257,8 @@ bool testCorpus(const etk::Uri& _srcCorpus) {
reco.setPenalityNotLinkSample(penalitySample);
reco.setPenalityAspectRatio(penalityAspectRatio);
reco.addGesture(gest);
etk::String filename = fileFiltered[iii].getPath().getFileName();
etk::Vector<etk::String> path = etk::split(fileFiltered[iii], '/');
etk::String filename = path[path.size()-1];
TEST_DEBUG("Test : " << fileFiltered[iii]);
for (size_t jjj=0; jjj<fileFiltered.size(); ++jjj) {
if (iii >= jjj) {
@ -280,7 +269,8 @@ bool testCorpus(const etk::Uri& _srcCorpus) {
dollar::Results res = reco.recognize(listPoints);
results[iii][jjj] = res.getConfidence();
results[jjj][iii] = res.getConfidence();
etk::String filename2 = fileFiltered[jjj].getPath().getFileName();
path = etk::split(fileFiltered[jjj], '/');
etk::String filename2 = path[path.size()-1];
TEST_DEBUG(" " << res.getConfidence() << " " << filename2);
}
}
@ -372,7 +362,8 @@ bool testCorpus(const etk::Uri& _srcCorpus) {
TEST_INFO(" nbElement : " << linkIds.size() << " / " << residualValues << " / " << fileFiltered.size());
TEST_INFO(" values : " << linkIds);
for (size_t jjj=0; jjj<ordered.size(); ++jjj) {
etk::String filename = fileFiltered[ordered[jjj].second].getPath().getFileName();;
etk::Vector<etk::String> path = etk::split(fileFiltered[ordered[jjj].second], '/');
etk::String filename = path[path.size()-1];
etk::String tmppp = " ";
if (jjj<linkIds.size()) {
tmppp = "*";
@ -403,7 +394,7 @@ bool testCorpus(const etk::Uri& _srcCorpus) {
residualValues -= (linkIds.size() +1);
TEST_DEBUG("Generate output files (SVG with all added path in one file)");
// Generate Files:
etk::Vector<etk::Uri> listPath;
etk::Vector<etk::String> listPath;
for (size_t iii=0; iii<linkIds.size(); ++iii) {
listPath.pushBack(fileFiltered[linkIds[iii]]);
}

33
tool/recorder/appl/widget/TextAreaRecognition.cpp
View File

@ -10,6 +10,7 @@
#include <etk/tool.hpp>
#include <ejson/ejson.hpp>
#include <esvg/esvg.hpp>
#include <etk/os/FSNode.hpp>
appl::widget::TextAreaRecognition::TextAreaRecognition() {
addObjectType("appl::widget::TextAreaRecognition");
@ -19,9 +20,9 @@ void appl::widget::TextAreaRecognition::init() {
ewol::Widget::init();
m_updateDone = false;
//m_dollarEngine.loadPath("DATA:///text");
//m_dollarEngine.loadPath("DATA:text");
m_dollarEngine = dollar::createEngine("$P+");
m_dollarEngine->loadPath("DATA:///reference");
m_dollarEngine->loadPath("DATA:reference");
// TODO: m_dollarEngine->setScaleKeepRatio(true);
markToRedraw();
// connect a periodic update ...
@ -80,13 +81,14 @@ void appl::widget::TextAreaRecognition::store(const etk::String& _userName, cons
list.add(obj);
}
etk::String streamOut = doc.generateMachineString();
etk::Path fileName = "~/DOLLAR/corpus";
etk::String fileName;
fileName = "HOME:DOLLAR/corpus/";
if (_value == "/") {
fileName /= "slash";
fileName += "slash";
} else if (_value == "\\") {
fileName /= "back-slash";
fileName += "back-slash";
} else {
fileName /= _value;
fileName += _value;
}
fileName += "_";
fileName += _type;
@ -95,14 +97,7 @@ void appl::widget::TextAreaRecognition::store(const etk::String& _userName, cons
fileName += "_";
fileName += etk::toString(m_time.get());
fileName += ".json";
{
ememory::SharedPtr<etk::io::Interface> fileIO = etk::uri::get(fileName);
if (fileIO->open(etk::io::OpenMode::Write) == false) {
return;
}
fileIO->writeAll(streamOut);
fileIO->close();
}
etk::FSNodeWriteAllData(fileName, streamOut);
APPL_WARNING("store: " << fileName);
}
@ -142,7 +137,7 @@ etk::Vector<etk::Vector<vec2>> scalePoints(etk::Vector<etk::Vector<vec2>> _list,
return _list;
}
etk::Vector<etk::Color<float,4>> renderWithSVG(const etk::Vector<etk::Vector<vec2>>& _list, int32_t _objectSize, const etk::Uri& _filename) {
etk::Vector<etk::Color<float,4>> renderWithSVG(const etk::Vector<etk::Vector<vec2>>& _list, int32_t _objectSize, const etk::String& _filename) {
// generate SVG to render:
esvg::Document docSvg;
etk::String data("<?xml version='1.0' encoding='UTF-8' standalone='no'?>\n");
@ -168,13 +163,7 @@ etk::Vector<etk::Color<float,4>> renderWithSVG(const etk::Vector<etk::Vector<vec
data += "</svg>\n";
docSvg.parse(data);
//docSvg.store(list[index]->getName()+ ".svg");
{
ememory::SharedPtr<etk::io::Interface> fileIO = etk::uri::get(_filename);
if (fileIO->open(etk::io::OpenMode::Write) == true) {
fileIO->writeAll(data);
fileIO->close();
}
}
etk::FSNodeWriteAllData(_filename, data);
// generate SVG output ...
ivec2 renderSize = ivec2(_objectSize,_objectSize);

2
tool/recorder/lutin_dollar-recorder.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.debug as debug
import lutin.tools as tools
import os