Revision f4b07d1e
client/java/src/main/java/de/uni-bielefeld/cit-ec/opensource/hlrc/client/Emotions.java | ||
---|---|---|
26 | 26 |
* |
27 | 27 |
*/ |
28 | 28 |
|
29 |
package de.uni-bielefeld.cit-ec.opensource.hlrc.client;
|
|
29 |
package de.uni_bielefeld.cit_ec.opensource.hlrc.client;
|
|
30 | 30 |
|
31 | 31 |
public enum Emotions { |
32 | 32 |
NEUTRAL, |
client/java/src/main/java/de/uni-bielefeld/cit-ec/opensource/hlrc/client/HeadAnimations.java | ||
---|---|---|
26 | 26 |
* |
27 | 27 |
*/ |
28 | 28 |
|
29 |
package de.uni-bielefeld.cit-ec.opensource.hlrc.client;
|
|
29 |
package de.uni_bielefeld.cit_ec.opensource.hlrc.client;
|
|
30 | 30 |
|
31 | 31 |
public enum HeadAnimations { |
32 | 32 |
IDLE, |
client/java/src/main/java/de/uni-bielefeld/cit-ec/opensource/hlrc/client/MiddlewareRSB.java | ||
---|---|---|
26 | 26 |
* |
27 | 27 |
*/ |
28 | 28 |
|
29 |
package de.uni-bielefeld.cit-ec.opensource.hlrc.client;
|
|
29 |
package de.uni_bielefeld.cit_ec.opensource.hlrc.client;
|
|
30 | 30 |
|
31 | 31 |
import java.util.ArrayList; |
32 | 32 |
import java.util.HashMap; |
client/java/src/main/java/de/uni-bielefeld/cit-ec/opensource/hlrc/client/RobotController.java | ||
---|---|---|
26 | 26 |
* |
27 | 27 |
*/ |
28 | 28 |
|
29 |
package de.uni-bielefeld.cit-ec.opensource.hlrc.client;
|
|
29 |
package de.uni_bielefeld.cit_ec.opensource.hlrc.client;
|
|
30 | 30 |
|
31 | 31 |
import java.util.ArrayList; |
32 | 32 |
import java.util.concurrent.ExecutionException; |
client/java/src/main/java/de/uni-bielefeld/cit-ec/opensource/hlrc/client/Tuple.java | ||
---|---|---|
26 | 26 |
* |
27 | 27 |
*/ |
28 | 28 |
|
29 |
package de.uni-bielefeld.cit-ec.opensource.hlrc.client;
|
|
29 |
package de.uni_bielefeld.cit_ec.opensource.hlrc.client;
|
|
30 | 30 |
|
31 | 31 |
/** |
32 | 32 |
* |
client/java/src/main/java/de/uni-bielefeld/cit-ec/opensource/hlrc/examples/SimpleExample.java | ||
---|---|---|
26 | 26 |
* |
27 | 27 |
*/ |
28 | 28 |
|
29 |
package de.uni-bielefeld.cit-ec.opensource.hlrc.examples;
|
|
29 |
package de.uni_bielefeld.cit_ec.opensource.hlrc.examples;
|
|
30 | 30 |
|
31 |
import de.uni-bielefeld.cit-ec.opensource.hlrc.client.Emotions;
|
|
32 |
import de.uni-bielefeld.cit-ec.opensource.hlrc.client.RobotController;
|
|
31 |
import de.uni_bielefeld.cit_ec.opensource.hlrc.client.Emotions;
|
|
32 |
import de.uni_bielefeld.cit_ec.opensource.hlrc.client.RobotController;
|
|
33 | 33 |
|
34 | 34 |
public class SimpleExample { |
35 | 35 |
|
client/java/src/main/java/de/uni-bielefeld/cit-ec/opensource/hlrc/main/Cmd.java | ||
---|---|---|
26 | 26 |
* |
27 | 27 |
*/ |
28 | 28 |
|
29 |
package de.uni-bielefeld.cit-ec.opensource.hlrc.main;
|
|
29 |
package de.uni_bielefeld.cit_ec.opensource.hlrc.main;
|
|
30 | 30 |
|
31 |
import de.uni-bielefeld.cit-ec.opensource.hlrc.client.HeadAnimations;
|
|
32 |
import de.uni-bielefeld.cit-ec.opensource.hlrc.client.Emotions;
|
|
33 |
import de.uni-bielefeld.cit-ec.opensource.hlrc.client.RobotController;
|
|
31 |
import de.uni_bielefeld.cit_ec.opensource.hlrc.client.HeadAnimations;
|
|
32 |
import de.uni_bielefeld.cit_ec.opensource.hlrc.client.Emotions;
|
|
33 |
import de.uni_bielefeld.cit_ec.opensource.hlrc.client.RobotController;
|
|
34 | 34 |
|
35 | 35 |
import java.util.logging.Level; |
36 | 36 |
import java.util.logging.Logger; |
... | ... | |
91 | 91 |
} |
92 | 92 |
|
93 | 93 |
if (line.getOptionValue("robotname") != null) { |
94 |
robot = new Robot(line.getOptionValue("robotname"), "RSB"); |
|
94 |
robot = new RobotController(line.getOptionValue("robotname"), "RSB");
|
|
95 | 95 |
} else { |
96 | 96 |
System.out.println("--> You need to provide a robot name, see --help"); |
97 | 97 |
return; |
client/java/src/test/java/HlrcClientTests.java | ||
---|---|---|
26 | 26 |
* |
27 | 27 |
*/ |
28 | 28 |
|
29 |
import de.uni-bielefeld.cit-ec.opensource.hlrc.client.HeadAnimations;
|
|
30 |
import de.uni-bielefeld.cit-ec.opensource.hlrc.client.Emotions;
|
|
31 |
import de.uni-bielefeld.cit-ec.opensource.hlrc.client.RobotController;
|
|
29 |
import de.uni_bielefeld.cit_ec.opensource.hlrc.client.HeadAnimations;
|
|
30 |
import de.uni_bielefeld.cit_ec.opensource.hlrc.client.Emotions;
|
|
31 |
import de.uni_bielefeld.cit_ec.opensource.hlrc.client.RobotController;
|
|
32 | 32 |
|
33 | 33 |
import org.junit.After; |
34 | 34 |
import org.junit.AfterClass; |
... | ... | |
62 | 62 |
|
63 | 63 |
@Before |
64 | 64 |
public void setUp() { |
65 |
this.r = new Robot("/home/kitchen/flobi", "RSB"); |
|
65 |
this.r = new RobotController("/home/kitchen/flobi", "RSB");
|
|
66 | 66 |
System.out.println("* HLRC CLIENT TESTS: @Before method"); |
67 | 67 |
} |
68 | 68 |
|
... | ... | |
75 | 75 |
public void testConstructor() { |
76 | 76 |
System.out.println("Constructor"); |
77 | 77 |
|
78 |
assertEquals("TestRobot", this.r.getRobotName()); |
|
78 |
assertEquals("TestRobot", this.r.getRobotControllerName());
|
|
79 | 79 |
assertEquals("RSB", r.getMiddleware()); |
80 | 80 |
} |
81 | 81 |
|
... | ... | |
94 | 94 |
@Test |
95 | 95 |
public void testEmotionCreation() { |
96 | 96 |
System.out.println("Emotion Message"); |
97 |
this.r.mw.createEmotionMessage(Emotions.SAD, 1000); |
|
97 |
this.r.mw.createCurrentEmotionMessage(Emotions.SAD, 1000);
|
|
98 | 98 |
} |
99 | 99 |
|
100 | 100 |
} |
Also available in: Unified diff