Skip to content

Commit

Permalink
more console errors, and print one console error when the class direc…
Browse files Browse the repository at this point in the history
…tory doesn't exist.

Former-commit-id: ac730a3
  • Loading branch information
stefie10 committed Jul 12, 2016
1 parent 9050805 commit ef68b14
Show file tree
Hide file tree
Showing 30 changed files with 122,157 additions and 16 deletions.
1,099 changes: 1,099 additions & 0 deletions default/objects/baxterNarrowLongFinger/ein/sceneModel/model.yml

Large diffs are not rendered by default.

This file was deleted.

31,972 changes: 31,972 additions & 0 deletions default/objects/vocab.yml

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion default/objects/vocab.yml.REMOVED.git-id

This file was deleted.

Binary file added images/gaze30006.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/gaze30006.tif.REMOVED.git-id

This file was deleted.

Binary file added images/gaze30007.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/gaze30007.tif.REMOVED.git-id

This file was deleted.

Binary file added images/gaze30008.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/gaze30008.tif.REMOVED.git-id

This file was deleted.

Binary file added images/gaze30009.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/gaze30009.tif.REMOVED.git-id

This file was deleted.

Binary file added images/gaze30010.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/gaze30010.tif.REMOVED.git-id

This file was deleted.

Binary file added images/gaze30011.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/gaze30011.tif.REMOVED.git-id

This file was deleted.

Binary file added images/gaze30012.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/gaze30012.tif.REMOVED.git-id

This file was deleted.

Binary file added images/ursula_neutral.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/ursula_neutral.tif.REMOVED.git-id

This file was deleted.

Binary file added images/ursula_no.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/ursula_no.tif.REMOVED.git-id

This file was deleted.

Binary file added images/ursula_yes.tif
Binary file not shown.
1 change: 0 additions & 1 deletion images/ursula_yes.tif.REMOVED.git-id

This file was deleted.

6 changes: 6 additions & 0 deletions src/ein.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13747,6 +13747,12 @@ void tryToLoadRangeMap(MachineState * ms, std::string classDir, const char *clas

string thisLabelName(className);

string objectDir = ms->config.data_directory + "/objects/" + thisLabelName;
if (! boost::filesystem::exists(objectDir)) {
CONSOLE_ERROR(ms, "Could not find " << objectDir << "... loading default empty class.");
}


{
string dirToMakePath = ms->config.data_directory + "/objects/" + thisLabelName + "/ein/ir2d/";
string this_range_path = dirToMakePath + "ir2d.yml";
Expand Down
4 changes: 2 additions & 2 deletions src/ein_scanning.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ virtual void execute(MachineState * ms) {
shared_ptr<Word> bWord = ms->popData();

if (bWord == NULL) {
cout << "oops, setClassLabels requires a number of StringWords followed by endArgs..." << endl;
CONSOLE_ERROR(ms, "oops, setClassLabels requires a number of StringWords followed by endArgs...");
ms->clearStack();
return;
} else {
Expand Down Expand Up @@ -401,7 +401,7 @@ virtual void execute(MachineState * ms) {
ms->config.numClasses = ms->config.classLabels.size();
changeTargetClass(ms, 0);
} else {
cout << "didn't get any valid labels, are you sure this is what you want?" << endl;
CONSOLE_ERROR(ms, "didn't get any valid labels, are you sure this is what you want?");
ms->config.classLabels.resize(0);
ms->config.classPoseModels.resize(0);
ms->pushWord("clearBlueBoxMemories");
Expand Down
Loading

0 comments on commit ef68b14

Please sign in to comment.