fix in kotlin, c#, cpp11, php, go

sat2707 · Sep 27, 2017 · d7bde81 · d7bde81
1 parent 31d4d05
commit d7bde81
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 44 deletions.
diff --git a/clients/c_sharp_client/client/core/api.cs b/clients/c_sharp_client/client/core/api.cs
@@ -77,11 +77,7 @@ public Elevator (JObject elevator)
 			this.id = (int)elevator.GetValue("id");
 			this.y = (float)elevator.GetValue("y");
 
-			this.passengers = new List<Passenger>();
-			foreach (Object passennger in (JArray)elevator.GetValue("passengers"))
-			{
-				passengers.Add(new Passenger((JObject)passennger));
-			}
+			this.passengers = Helpers.ParsePassengers(elevator, "passengers");
 
 			this.state = (int)elevator.GetValue("state");
 			this.speed = (float)elevator.GetValue("speed");
@@ -128,7 +124,7 @@ public int Id
 		}
 
 		public int Elevator
-		{ 
+		{
 			get { return elevator; }
 		}
 
@@ -166,19 +162,19 @@ public int State
 		}
 
 		public int TimeToAway
-		{ 
+		{
 			get { return timeToAway; }
 		}
 
-		public String Type 
-		{ 
+		public String Type
+		{
 			get { return type; }
 		}
 
-		public int Floor 
+		public int Floor
 		{
 			get { return floor; }
-		} 
+		}
 
 		public List<JObject> Messages
 		{
@@ -190,12 +186,18 @@ public List<JObject> Messages
 		public Passenger (JObject passenger)
 		{
 			id = (int)passenger.GetValue ("id");
-			try {
-				elevator = (int)passenger.GetValue ("elevator");
+
+			JToken jToken = passenger.GetValue ("elevator");
+
+			if (jToken != null && jToken.Type == JTokenType.Integer)
+			{
+			    elevator = (int)jToken;
 			}
-			catch (System.ArgumentException) {
+			else
+			{
 				elevator = -1;
 			}
+
 			x = (float)passenger.GetValue("x");
 			y = (float)passenger.GetValue("y");
 			weight = (float)passenger.GetValue("weight");
@@ -244,7 +246,7 @@ public DebugClass()
 
 		public List<JObject> Messages
 		{
-			get 
+			get
 			{
 				List<JObject> messages = this.messages;
 				this.messages = new List<JObject>();
@@ -282,10 +284,10 @@ public class api
 		baseStrategy strategy = null;
 
 
-		public api() 
+		public api()
 		{
 			debug = new DebugClass ();
-			try 
+			try
 			{
 				strategy = new client.strategy ();
 				strategy.Debug = debug;
@@ -297,38 +299,22 @@ public api()
 
 		private Tuple<List<Passenger>, List<Elevator>, List<Passenger>, List<Elevator>> parseState (JObject state)
 		{
-			List<Passenger> myPassengers = new List<Passenger>();
-			List<Elevator> myElevators = new List<Elevator>(3);
+			List<Passenger> myPassengers = Helpers.ParsePassengers(state, "my_passengers");
+			List<Elevator> myElevators = Helpers.ParseElevators(state, "my_elevators");
 
-			foreach (Object passennger in (JArray) state.GetValue("my_passengers")) {
-				myPassengers.Add (new Passenger ((JObject)passennger));
-			}
-			foreach (Object elevator in (JArray) state.GetValue("my_elevators")) {
-				myElevators.Add (new Elevator ((JObject)elevator));
-			}
-
-			List<Passenger> enemyPassengers = new List<Passenger>();
-			List<Elevator> enemyElevators = new List<Elevator>(3);
-
-			foreach (Object passennger in (JArray)state.GetValue("enemy_passengers"))
-			{
-				enemyPassengers.Add(new Passenger((JObject)passennger));
-			}
-			foreach (Object elevator in (JArray)state.GetValue("enemy_elevators"))
-			{
-				enemyElevators.Add(new Elevator((JObject)elevator));
-			}
+			List<Passenger> enemyPassengers = Helpers.ParsePassengers(state, "enemy_passengers");
+			List<Elevator> enemyElevators = Helpers.ParseElevators(state, "enemy_elevators");
 
 
 			return new Tuple<List<Passenger>, List<Elevator>, List<Passenger>, List<Elevator>>(myPassengers, myElevators, enemyPassengers, enemyElevators);
 		}
 
 		public JArray turn (JObject state) {
 			Tuple<List<Passenger>, List<Elevator>, List<Passenger>, List<Elevator>> quadruple = parseState(state);
-			try 
+			try
 			{
 				this.strategy.onTick (quadruple.Item1, quadruple.Item2, quadruple.Item3, quadruple.Item4);
-			} catch (Exception e) 
+			} catch (Exception e)
 			{
 				debug.exception (e);
 			}
@@ -352,7 +338,36 @@ public JArray turn (JObject state) {
 
 			return resultArray;
 		}
-
 	}
-}
 
+	static class Helpers
+	{
+		public static List<Passenger> ParsePassengers(JObject jObject, string propertyName)
+		{
+			var values = (JArray)jObject.GetValue(propertyName);
+
+			List<Passenger> passengers = new List<Passenger>(values.Count);
+
+			foreach (JObject passenger in values)
+			{
+				passengers.Add(new Passenger(passenger));
+			}
+
+			return passengers;
+        }
+
+		public static List<Elevator> ParseElevators(JObject jObject, string propertyName)
+		{
+			var values = (JArray)jObject.GetValue(propertyName);
+
+			List<Elevator> elevators = new List<Elevator>(values.Count);
+
+			foreach (JObject elevator in values)
+			{
+				elevators.Add(new Elevator(elevator));
+			}
+
+			return elevators;
+        }
+	}
+}
diff --git a/clients/cpp11_client/client/core/api.h b/clients/cpp11_client/client/core/api.h
@@ -133,6 +133,8 @@ class Debug {
     QString toString(double smth) { return QString::number(smth); }
 
     QString toString(char smth) { return QString(smth); }
+    QString toString(const std::string &smth) { return QString::fromStdString(smth); }
+    QString toString(const char *smth) { return QString(smth); }
     QString toString(QString smth) { return QString(smth); }
     QString toString(Passenger& smth) { return "Passenger id=" + toString(smth.id); }
     QString toString(Elevator& smth) { return "Elevator id=" + toString(smth.id); }
@@ -222,4 +224,4 @@ private slots:
     void sendActions(QJsonArray);
 };
 
-#endif // API_H
+#endif // API_H
diff --git a/clients/go_client/client/src/client/core/API/API.go b/clients/go_client/client/src/client/core/API/API.go
@@ -38,7 +38,7 @@ func (a *API) parseState(state map[string]interface{}) ([]*Passenger, []*Elevato
 }
 
 func (a *API) Turn(state map[string]interface{}) []interface{}{
-	var messages []interface{}
+	messages := []interface{}{}
 
 	myPassengers, myElevators, enemyPassengers, enemyElevators := a.parseState(state)
 

diff --git a/clients/kotlin_client/client/src/main/kotlin/core/API/Passenger.kt b/clients/kotlin_client/client/src/main/kotlin/core/API/Passenger.kt
@@ -17,6 +17,7 @@ class Passenger(passenger: JSONObject) : MessagesInterface{
   private val messages = ArrayList<JSONObject>()
   var x: Double = passenger["x"]?.toString()?.toDouble() ?: 0.0
   var y: Double = passenger["y"]?.toString()?.toDouble() ?: 0.0
+  var weight: Double = passenger["weight"]?.toString()?.toDouble() ?: 0.0
 
   override fun getMessages(): List<JSONObject> = messages
 

diff --git a/clients/php7_client/client/core/api.php b/clients/php7_client/client/core/api.php
@@ -194,7 +194,8 @@ public function parse_state($state) {
                     $p->from_floor,
                     $p->dest_floor,
                     $p->type,
-                    $p->floor
+                    $p->floor,
+                    $p->weight
                 );
             }, $enemy_passengers);