balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-11-22 00:02:28 +00:00
Code Issues Releases Wiki Activity
297 Commits 15 Branches 76 Tags 14 MiB
97cd443c16
Commit Graph

297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J. Fernando Sánchez
97cd443c16 Push in fix-makefiles too 2017-10-03 15:17:40 +02:00
J. Fernando Sánchez
49afd2cfdd Updated makefiles from senpy 2017-10-03 15:08:16 +02:00
J. Fernando Sánchez
c1174189c6 Updated makefiles from senpy 2017-10-03 13:46:09 +02:00
J. Fernando Sánchez
ea536c0daf Added fix-makefiles to deploy rules 2017-10-03 13:43:30 +02:00
J. Fernando Sánchez
a67e0e45d2 Simplified makefile 2017-10-03 13:42:17 +02:00
J. Fernando Sánchez
5f4dc3ac5d Testing new k8s mk 2017-10-03 13:41:51 +02:00
J. Fernando Sánchez
1a3b8ee703 Add '.makefiles/' from commit '21ff551769dd7e4ebd895b90d918040859a90e41' 
git-subtree-dir: .makefiles
git-subtree-mainline: 9c61c18220
git-subtree-split: 21ff551769
 2017-10-03 11:28:56 +02:00
J. Fernando Sánchez
9c61c18220 Removed .makefiles 2017-10-03 11:28:50 +02:00
J. Fernando Sánchez
21ff551769 Merge branch 'sentiment-meaningCloud' into 'master' 
Updated makefiles from sentiment-meaningCloud

See merge request docs/templates/makefiles!4
 2017-10-03 08:36:16 +00:00
militarpancho
3dc27f12f7 Updated makefiles from sentiment-meaningCloud 2017-10-02 13:12:17 +02:00
J. Fernando Sánchez
9957486f4f Merge branch 'gsictl' into 'master' 
Gsictl

See merge request docs/templates/makefiles!3
 2017-09-30 19:08:57 +00:00
J. Fernando Sánchez
0dc93fc16b Updated makefiles from gsictl 2017-09-29 15:53:14 +02:00
J. Fernando Sánchez
cbef9630b4 Updated makefiles from gsictl 2017-09-29 15:51:56 +02:00
J. Fernando Sánchez
a3a9414073 Updated makefiles from gsictl 2017-09-29 15:39:26 +02:00
J. Fernando Sánchez
14bcfd511f Updated makefiles from gsictl 2017-09-29 15:38:59 +02:00
J. Fernando Sánchez
3d23370a59 Updated makefiles from gsictl 2017-09-29 15:33:58 +02:00
J. Fernando Sánchez
f9a75f4e21 Updated makefiles from gsictl 2017-09-29 15:32:51 +02:00
J. Fernando Sánchez
99d4bc70bc Updated makefiles from gsictl 2017-09-29 15:32:11 +02:00
J. Fernando Sánchez
fc94b45448 Updated makefiles from gsictl 2017-09-29 15:14:29 +02:00
J. Fernando Sánchez
53db670715 Updated makefiles from gsictl 2017-09-29 15:11:08 +02:00
J. Fernando Sánchez
963211caf2 Updated makefiles from gsictl 2017-09-29 15:00:37 +02:00
J. Fernando Sánchez
2ca9d36f80 Merge branch 'senpy' into 'master' 
K8s changes in senpy

See merge request docs/templates/makefiles!2
 2017-09-28 10:57:51 +00:00
J. Fernando Sánchez
b1dbe432c1 Remove curly braces from makefile 
In gitlab, make is using /bin/sh, which does not accept brace expansion
 2017-09-28 10:39:29 +02:00
J. Fernando Sánchez
921d7f23ce Remove curly braces from makefile 
In gitlab, make is using /bin/sh, which does not accept brace expansion
 2017-09-28 10:39:29 +02:00
J. Fernando Sánchez
8bfb88c926 More fixes to k8s recipe 2017-09-28 10:33:26 +02:00
J. Fernando Sánchez
8ad2fae774 More fixes to k8s recipe 2017-09-28 10:33:26 +02:00
J. Fernando Sánchez
eb09da878f Fixed wildcard in k8s recipe 2017-09-28 10:22:46 +02:00
J. Fernando Sánchez
407fd718a3 Fixed wildcard in k8s recipe 2017-09-28 10:22:46 +02:00
J. Fernando Sánchez
3bba29fc4e Merge branch 'senpy' into 'master' 
Senpy

See merge request docs/templates/makefiles!1
 2017-09-27 19:46:04 +00:00
J. Fernando Sánchez
4344fccd57 Merge branch 'master' into 'senpy' 
# Conflicts:
#   makefiles.mk
 2017-09-27 19:45:43 +00:00
J. Fernando Sánchez
0ccdf735e1 Updated makefiles from senpy 2017-09-27 21:43:54 +02:00
J. Fernando Sánchez
7444aa7ec8 Updated makefiles from senpy 2017-09-27 21:43:54 +02:00
J. Fernando Sánchez
5d68c0225a Updated Makefile to include makefiles.mk 2017-09-27 21:38:27 +02:00
J. Fernando Sánchez
cda9f5c4ca Updated makefiles from senpy 2017-09-27 21:38:19 +02:00
J. Fernando Sánchez
a825e91425 Updated makefiles from senpy 2017-09-27 21:38:19 +02:00
J. Fernando Sánchez
473efd8dd7 Updated makefiles from senpy 2017-09-27 21:15:17 +02:00
J. Fernando Sánchez
6f489acdfc First version of makefiles 2017-09-27 21:08:21 +02:00
J. Fernando Sánchez
a73f3112ab First version of makefiles 2017-09-27 21:08:21 +02:00
J. Fernando Sánchez
5a53ba23e2 Fixed k8s deployment 2017-09-27 18:58:29 +02:00
J. Fernando Sánchez
e3a9a3464c Fixed push to DOCKERHUB 2017-09-27 16:31:47 +02:00
J. Fernando Sánchez
3e3f5555ff Fixed py2 problems and other improvements 
We've changed the way plugins are activated, and removed the notion of
deactivated plugins.
Now plugins activate asynchronously.
When calling a plugin, it will be activated if it wasn't, and the call will wait
for the plugin to be fully activated.
 2017-08-27 20:00:29 +02:00
J. Fernando Sánchez
7aa91d1d60 Fixed FSRE dimension names to match ontology 
http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/emotionml/ns
 2017-08-23 18:44:08 +02:00
drevicko
2480ec310e bump version number in ekman2vad.senpy 2017-08-23 18:42:02 +02:00
drevicko
9b956b2358 uses emotionML vocab names for VAD dimensions 2017-08-23 18:42:02 +02:00
drevicko
83ddd5e990 add neutralValue to fsre conversion senpy file 2017-08-23 18:42:02 +02:00
drevicko
d77d01c3e1 Adds neutral value to conversion senpy files 2017-08-23 18:40:18 +02:00
drevicko
f6271495c1 use emoionml names for fsre and pad dimensions 
This lines up the names in the conversion plugins with the [emotionML suggested vocab](https://www.w3.org/TR/emotion-voc/#dimensions).

emoml has different names for the 4-dimensional fsre scheme and the 3-dimensional vad scheme, which this pull request has added.

I've added the "unpredictability" dimension and mapped big6:surprise to it's maximum value. The assumption is that surprise varies between 5 and 10 to be in line with the other dimensions (no such thing as negative surprise, so no values less than 5). I see that arousal also has all values >5 (so no negative arousal). Ideally, surprise mappings for V, A and D should be calculated empirically - I think there'll be some arousal and possibly slightly lowered dominance.

I wonder if we should use another colon in the emoml names, eg: "emoml:fsredim:valence" or "emoml:big6:happiness", since the [emoml suggested vocab](https://www.w3.org/TR/emotion-voc/xml) only specifies names like "happiness" in a category "big6" (ie: it's hard to know which is the category in "big6happiness").
We'd have to go through the example plugins and make sure they also conform...

open to discussion on this btw...

ps: apologies for multiple changes in this one pr..
 2017-08-23 18:40:18 +02:00
drevicko
1cccd9d5cb Minor change in description text 2017-08-23 18:40:18 +02:00
J. Fernando Sánchez
a243f68bfc WIP simpler pipeline 2017-08-23 18:17:26 +02:00
J. Fernando Sánchez
fca0ac00c4 Merge branch '38-json-serialization-problem-with-sets' 2017-08-23 16:15:35 +02:00