Merge pull request #17 from wardzinskim/master

loading tspTask from string

TspLibNet/TspLibNet/TSP/TspFile.cs

@@ -19,6 +19,9 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+
+using System.Text;
+
 namespace TspLibNet.TSP
 {
     using System.Collections.Generic;
@@ -44,7 +47,7 @@ public class TspFile
         /// Gets file comment - additional comments from problem author
         /// </summary>
         public string Comment;
-                
+
         /// <summary>
         /// Gets problem dimension, for TSP and ATSP is a number of nodes. For CVRP total number of nodes and depots. For tour it is a dimension of coresponding problem.
         /// </summary>
@@ -64,7 +67,7 @@ public class TspFile
         /// Describes format of the edge weights if are given explicitly
         /// </summary>
         public EdgeWeightFormat EdgeWeightFormat = EdgeWeightFormat.Function;
-        
+
         /// <summary>
         /// Describes the format in which the edges of a grap are given, if the graph is not complete
         /// </summary>
@@ -137,5 +140,25 @@ public static TspFile Load(string fileName)
 
             return result;
         }
+
+        /// <summary>
+        /// Loads TSP from string
+        /// </summary>
+        /// <param name="content">tsp task</param>
+        /// <returns>Load tsp file</returns>
+        public static TspFile LoadFromString(string content)
+        {
+            TspFile result = null;
+            TspFileLoader loader = new TspFileLoader();
+            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(content)))
+            {
+                using (StreamReader reader = new StreamReader(ms))
+                {
+                    result = loader.Load(reader);
+                    reader.Close();
+                }
+            }
+            return result;
+        }
     }
 }

TspLibNet/TspLibNet/TravelingSalesmanProblem.cs

@@ -80,6 +80,11 @@ public static TravelingSalesmanProblem FromFile(string fileName)
             return FromTspFile(TspFile.Load(fileName));
         }
 
+        public static TravelingSalesmanProblem FromString(string content)
+        {
+            return FromTspFile(TspFile.LoadFromString(content));
+        }
+
         /// <summary>
         /// Create problem from list of nodes
         /// </summary>