Skip to content

Commit

Permalink
[Mod] Updaate factory for RCJ23
Browse files Browse the repository at this point in the history
  • Loading branch information
@akinobu1998
akinobu1998 committed Apr 8, 2023
1 parent 91234c3 commit 2862199
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 225 deletions.
2 changes: 1 addition & 1 deletion CommandGenerator/Category.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public void AddObject(string name, GPSRObjectType type){
break;

case GPSRObjectType.Known:
tier = DifficultyDegree.Easy;
tier = DifficultyDegree.Low;
break;

default:
Expand Down
374 changes: 150 additions & 224 deletions GPSRCmdGen/Factory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,228 +4,154 @@

namespace RoboCup.AtHome.GPSRCmdGen
{
/// <summary>
/// Helper class that produces lists and containers with predefined example data
/// </summary>
public static class Factory
{
/// <summary>
/// Gets a list with predefined gestures.
/// </summary>
/// <returns>A list with predefined gestures.</returns>
public static List<Gesture> GetDefaultGestures()
{
List<Gesture> gestures = new List<Gesture>();
gestures.Add(new Gesture("waving", DifficultyDegree.Low));
gestures.Add(new Gesture("rising left arm", DifficultyDegree.Low));
gestures.Add(new Gesture("rising right arm", DifficultyDegree.Low));
gestures.Add(new Gesture("pointing left", DifficultyDegree.Low));
gestures.Add(new Gesture("pointing right", DifficultyDegree.Low));
return gestures;
}

/// <summary>
/// Gets a list with predefined locations.
/// </summary>
/// <returns>A list with predefined locations.</returns>
public static List<Room> GetDefaultLocations()
{
List<Room> tmp = new List<Room>();
Room bedroom = new Room("bedroom");
bedroom.AddBeacon("bed");
bedroom.AddPlacement("bedside");
tmp.Add(bedroom);

Room livingroom = new Room("living room");
livingroom.AddPlacement("living shelf");
livingroom.AddLocation("TV stand", true, true);
livingroom.AddLocation("living table", true, true);
tmp.Add(livingroom);

Room office = new Room("office");
office.AddPlacement("drawer");
office.AddLocation("desk", true, true);
tmp.Add(office);

Room kitchen = new Room("kitchen");
kitchen.AddPlacement("bar");
kitchen.AddPlacement("cupboard");
kitchen.AddLocation("sink", true, true);
kitchen.AddPlacement("sideshelf");
kitchen.AddPlacement("bookcase");
kitchen.AddLocation("dining table", true, true);
tmp.Add(kitchen);

Room corridor = new Room("corridor");
corridor.AddLocation("cabinet", true, true);
tmp.Add(corridor);
return tmp;
}

/// <summary>
/// Gets a list with predefined names.
/// </summary>
/// <returns>A list with predefined names.</returns>
public static List<PersonName> GetDefaultNames()
{
List<PersonName> names = new List<PersonName>();

string[] male = new string[] {
"Noah",
"Liam",
"Mason",
"Jacob",
"William",
"Ethan",
"Michael",
"Alexander",
"James",
"Daniel"
};

string[] female = new string[] {
"Emma",
"Taylor",
"Sophia",
"Isabella",
"Ava",
"Robin",
"Emily",
"Angel",
"Madison",
"Charlotte"
};
foreach (string s in female)
names.Add(new PersonName(s, Gender.Female));

foreach (string s in male)
names.Add(new PersonName(s, Gender.Male));

return names;
}

/// <summary>
/// Gets a GPSRObjectManager which contains example GPSRObjects grouped by category.
/// </summary>
/// <returns>A GPSRObjectManager with default objects.</returns>
public static List<Category> GetDefaultObjects()
{
List<Category> tmp = new List<Category>();

SpecificLocation desk = SpecificLocation.Placement("desk");
desk.Room = new Room("office");
Category snacks = new Category("snacks", desk);
snacks.AddObject("chips", GPSRObjectType.Known, DifficultyDegree.Moderate);
snacks.AddObject("pretzels", GPSRObjectType.Known, DifficultyDegree.Moderate);
snacks.AddObject("pringles", GPSRObjectType.Known);
tmp.Add(snacks);

SpecificLocation bedside = SpecificLocation.Placement("bedside");
bedside.Room = new Room("bedroom");
Category candies = new Category("candies", bedside);
candies.AddObject("choco syrup", GPSRObjectType.Known, DifficultyDegree.Moderate);
candies.AddObject("bisquits", GPSRObjectType.Known, DifficultyDegree.Low);
candies.AddObject("baby sweets", GPSRObjectType.Alike, DifficultyDegree.Moderate);
candies.AddObject("egg", GPSRObjectType.Known, DifficultyDegree.High);
tmp.Add(candies);

SpecificLocation sideshelf = SpecificLocation.Placement("sideshelf");
sideshelf.Room = new Room("dining room");
Category food = new Category("food", sideshelf);
food.AddObject("apple", GPSRObjectType.Alike);
food.AddObject("paprika", GPSRObjectType.Alike);
food.AddObject("pumper nickel", GPSRObjectType.Known, DifficultyDegree.Moderate);
tmp.Add(food);

SpecificLocation bookcase = SpecificLocation.Placement("bookcase");
bookcase.Room = new Room("Kitchen");
Category drinks = new Category("drinks", bookcase);
drinks.AddObject("tea", GPSRObjectType.Known);
drinks.AddObject("beer", GPSRObjectType.Known);
drinks.AddObject("coke", GPSRObjectType.Known);
drinks.AddObject("coconut milk", GPSRObjectType.Known, DifficultyDegree.Moderate);
tmp.Add(drinks);

SpecificLocation livingshelf = SpecificLocation.Placement("living shelf");
livingshelf.Room = new Room("living room");
Category toiletries = new Category("toiletries", livingshelf);
toiletries.AddObject("shampoo", GPSRObjectType.Known, DifficultyDegree.Moderate);
toiletries.AddObject("soap", GPSRObjectType.Known);
toiletries.AddObject("cloth", GPSRObjectType.Alike, DifficultyDegree.High);
toiletries.AddObject("spponge", GPSRObjectType.Known, DifficultyDegree.High);
tmp.Add(toiletries);

SpecificLocation sink = SpecificLocation.Placement("sink");
sink.Room = new Room("kitchen");
Category containers = new Category("containers", sink);
containers.AddObject("bowl", GPSRObjectType.Known, DifficultyDegree.High);
containers.AddObject("tray", GPSRObjectType.Known, DifficultyDegree.High);
containers.AddObject("plate", GPSRObjectType.Known, DifficultyDegree.High);
tmp.Add(containers);

return tmp;

}

/// <summary>
/// Gets a list with predefined questions.
/// </summary>
/// <returns>A list with predefined questions.</returns>
internal static List<PredefindedQuestion> GetDefaultQuestions()
{
List<PredefindedQuestion> q = new List<PredefindedQuestion>();
q.Add(new PredefindedQuestion("Who are the inventors of the C programming language?", "Ken Thompson and Dennis Ritchie "));
q.Add(new PredefindedQuestion("Who is the inventor of the Python programming language?", "Guido van Rossum"));
q.Add(new PredefindedQuestion("Which robot was the star in the movie Wall-E?", "Wall-E"));
q.Add(new PredefindedQuestion("Where does the term computer bug come from?", "From a moth trapped in a relay"));
q.Add(new PredefindedQuestion("What is the name of the round robot in the new Star Wars movie?", "BB-8"));
q.Add(new PredefindedQuestion("How many curry sausages are eaten in Germany each year?", "About 800 million currywurst every year"));
q.Add(new PredefindedQuestion("Who is president of the galaxy in The Hitchhiker's Guide to the Galaxy?", "Zaphod Beeblebrox"));
q.Add(new PredefindedQuestion("Which robot is the love interest in Wall-E?", "EVE"));
q.Add(new PredefindedQuestion("Which company makes ASIMO?", "Honda"));
q.Add(new PredefindedQuestion("What company makes Big Dog?", "Boston Dynamics"));
q.Add(new PredefindedQuestion("What is the funny clumsy character of the Star Wars prequals?", "Jar-Jar Binks"));
q.Add(new PredefindedQuestion("How many people live in the Germany?", "A little over 80 million"));
q.Add(new PredefindedQuestion("What are the colours of the German flag?", "Black red and yellow"));
q.Add(new PredefindedQuestion("What city is the capital of the Germany?", "Berlin"));
q.Add(new PredefindedQuestion("How many arms do you have?", "..."));
q.Add(new PredefindedQuestion("What is the heaviest element?", "Plutonium when measured by the mass of the element but Osmium is densest"));
q.Add(new PredefindedQuestion("What did Alan Turing create?", "Many things like Turing machines and the Turing test"));
q.Add(new PredefindedQuestion("Who is the helicopter pilot in the A-Team?", "Captain Howling Mad Murdock"));
q.Add(new PredefindedQuestion("What Apollo was the last to land on the moon?", "Apollo 17"));
q.Add(new PredefindedQuestion("Who was the last man to step on the moon?", "Gene Cernan"));
q.Add(new PredefindedQuestion("In which county is the play of Hamlet set?", "Denmark"));
q.Add(new PredefindedQuestion("What are names of Donald Duck's nephews?", "Huey Dewey and Louie Duck"));
q.Add(new PredefindedQuestion("How many metres are in a mile?", "About 1609 metres"));
q.Add(new PredefindedQuestion("Name a dragon in The Lord of the Rings?", "Smaug"));
q.Add(new PredefindedQuestion("Who is the Chancellor of Germany?", "Angela Merkel"));
q.Add(new PredefindedQuestion("Who developed the first industrial robot?", "The American physicist Joseph Engelberg. He is also considered the father of robotics."));
q.Add(new PredefindedQuestion("What's the difference between a cyborg and an android?", "Cyborgs are biological being with electromechanical enhancements. Androids are human-shaped robots."));
q.Add(new PredefindedQuestion("Do you know any cyborg?", "Professor Kevin Warwick. He implanted a chip in in his left arm to remotely operate doors an artificial hand and an electronic wheelchair."));
q.Add(new PredefindedQuestion("In which city is this year's RoboCup hosted?", "In Leipzig Germany."));
q.Add(new PredefindedQuestion("Which city hosted last year's RoboCup?", "In Hefei China."));
q.Add(new PredefindedQuestion("In which city will next year's RoboCup be hosted?", "It hasn't been announced yet."));
q.Add(new PredefindedQuestion("Name the main rivers surrounding Leipzig", "The Parthe Pleisse and the White Elster."));
q.Add(new PredefindedQuestion("What is the Cospudener See?", "The Cospudener See is a lake situated south of Leipzig on the site of a former open cast mine."));
q.Add(new PredefindedQuestion("Where started the peaceful revolution of 1989?", "The peaceful revolution started in September 4 1989 in Leipzig at the St. Nicholas Church."));
q.Add(new PredefindedQuestion("Where is the world's oldest trade fair hosted?", "The world's oldest trade fair is in Leipzig."));
q.Add(new PredefindedQuestion("Where is one of the world's largest dark music festivals hosted?", "Leipzig hosts one of the world's largest dark music festivals."));
q.Add(new PredefindedQuestion("Where is Europe's oldest continuous coffee shop hosted?", "Europe's oldest continuous coffee shop is in Leipzig."));
q.Add(new PredefindedQuestion("Name one of the greatest German composers", "Johann Sebastian Bach."));
q.Add(new PredefindedQuestion("Where is Johann Sebastian Bach buried?", "Johann Sebastian Bach is buried in St. Thomas' Church here in Leipzig."));
q.Add(new PredefindedQuestion("Do you have dreams?", "I dream of Electric Sheeps."));
q.Add(new PredefindedQuestion("Hey what's up?", "I don't know since I've never been there."));
q.Add(new PredefindedQuestion("There are seven days in a week. True or false?", "True there are seven days in a week."));
q.Add(new PredefindedQuestion("There are eleven days in a week. True or false?", "False there are seven days in a week not eleven."));
q.Add(new PredefindedQuestion("January has 31 days. True or false?", "True January has 31 days."));
q.Add(new PredefindedQuestion("January has 28 days. True or false?", "False January has 31 days not 28."));
q.Add(new PredefindedQuestion("February has 28 days. True or false?", "True but in leap-years has 29."));
q.Add(new PredefindedQuestion("February has 31 days. True or false?", "False February has either 28 or 29 days. Depend on the year."));
q.Add(new PredefindedQuestion("Do you have dreams?", "I dream of Electric Sheep."));
q.Add(new PredefindedQuestion("Who used first the word Robot?", "The word robot was first used by Czech writer Karel Capek."));
q.Add(new PredefindedQuestion("What origin has the word Robot?", "The Czech word robota that means forced work or labour"));
return q;
}
}
/// <summary>
/// Helper class that produces lists and containers with predefined example data
/// </summary>
public static class Factory
{
/// <summary>
/// Gets a list with predefined gestures.
/// </summary>
/// <returns>A list with predefined gestures.</returns>
public static List<Gesture> GetDefaultGestures()
{
List<Gesture> gestures = new List<Gesture>();
gestures.Add(new Gesture("waving", DifficultyDegree.Low));
gestures.Add(new Gesture("rising left arm", DifficultyDegree.Low));
gestures.Add(new Gesture("rising right arm", DifficultyDegree.Low));
gestures.Add(new Gesture("pointing left", DifficultyDegree.Low));
gestures.Add(new Gesture("pointing right", DifficultyDegree.Low));
return gestures;
}

/// <summary>
/// Gets a list with predefined locations.
/// </summary>
/// <returns>A list with predefined locations.</returns>
public static List<Room> GetDefaultLocations()
{
List<Room> tmp = new List<Room>();

Room hallway = new Room("hallway");
hallway.AddLocation("tall table", true, true);
hallway.AddPlacement("bin c");
hallway.AddPlacement("bin d");
tmp.Add(hallway);

Room livingroom = new Room("living room");
livingroom.AddLocation("long table a", true, true);
livingroom.AddLocation("long table b", true, true);
livingroom.AddPlacement("bin a");
livingroom.AddPlacement("bin b");
tmp.Add(livingroom);

Room diningroom = new Room("dining room");
diningroom.AddPlacement("chair a");
diningroom.AddPlacement("chair b");
diningroom.AddLocation("shelf", true, true);
tmp.Add(diningroom);

return tmp;
}

/// <summary>
/// Gets a list with predefined names.
/// </summary>
/// <returns>A list with predefined names.</returns>
public static List<PersonName> GetDefaultNames()
{
List<PersonName> names = new List<PersonName>();

string[] male = new string[] {
"Angel",
"Charlie",
"Hunter",
"Jack",
"Max",
"Noah",
"Oliver",
"Parker",
"Sam",
"Thomas",
"William"
};

string[] female = new string[] {
"Amelia",
"Angel",
"Ava",
"Charlie",
"Charlotte",
"Hunter",
"Max",
"Mia",
"Olivia",
"Parker",
"Sam"
};
foreach (string s in female)
names.Add(new PersonName(s, Gender.Female));

foreach (string s in male)
names.Add(new PersonName(s, Gender.Male));

return names;
}

/// <summary>
/// Gets a GPSRObjectManager which contains example GPSRObjects grouped by category.
/// </summary>
/// <returns>A GPSRObjectManager with default objects.</returns>
public static List<Category> GetDefaultObjects()
{
List<Category> tmp = new List<Category>();

SpecificLocation talltable = SpecificLocation.Placement("tall table");
talltable.Room = new Room("hallway");
Category task = new Category("tasks", talltable);
task.AddObject("dice", GPSRObjectType.Known);
task.AddObject("light bulb", GPSRObjectType.Known);
task.AddObject("block", GPSRObjectType.Known);
tmp.Add(task);

SpecificLocation livingroom = SpecificLocation.Placement("living room");
livingroom.Room = new Room("living room");
Category kitchen = new Category("kitchen items", livingroom);
kitchen.AddObject("detergent", GPSRObjectType.Known);
kitchen.AddObject("cup", GPSRObjectType.Known);
kitchen.AddObject("lunch box", GPSRObjectType.Alike);
tmp.Add(kitchen);

SpecificLocation shelf = SpecificLocation.Placement("shlef");
shelf.Room = new Room("dining room");
Category food = new Category("food", shelf);
food.AddObject("noodle", GPSRObjectType.Known);
food.AddObject("cookies", GPSRObjectType.Known);
food.AddObject("potato chips", GPSRObjectType.Known);
tmp.Add(food);

return tmp;

}

/// <summary>
/// Gets a list with predefined questions.
/// </summary>
/// <returns>A list with predefined questions.</returns>
internal static List<PredefindedQuestion> GetDefaultQuestions()
{
List<PredefindedQuestion> q = new List<PredefindedQuestion>();
q.Add(new PredefindedQuestion("What is your teamfs name?", "My team is SSH."));
q.Add(new PredefindedQuestion("What day is it today?", "Today is March 8th."));
q.Add(new PredefindedQuestion("What is the highest mountain in the world?", "It is Mt. Everest."));
q.Add(new PredefindedQuestion("How much is 174 minus 11?", "It is 163."));
q.Add(new PredefindedQuestion("How many campuses does Tokyo University have?", "Tokyo University has 3 campuses."));
q.Add(new PredefindedQuestion("Where will RoboCup 2023 take place?", "RoboCup 2023 will take place in Bordeaux, France."));
q.Add(new PredefindedQuestion("Who is the current governor of Tokyo?", "The current governor of Tokyo is Yuriko Koike."));
q.Add(new PredefindedQuestion("Where are you from?", "Ifm from Japan."));
q.Add(new PredefindedQuestion("What is your favorite team?", "Absolutely SSH! But wefre want to explore other team as well."));
q.Add(new PredefindedQuestion("How many members in your team?", "I have 10 wonderful members in my team."));
return q;
}
}
}

0 comments on commit 2862199

Please sign in to comment.