Merge branch 'development'

.gitignore

@@ -5,6 +5,7 @@ obj
 *.pidb
 *.suo
 *.vsp
+*.ipch
 
 /Setup/Accord.Setup.dll
 /Setup/Accord.Setup.pdb
@@ -20,6 +21,8 @@ obj
 /Docs
 /Unit Tests/Accord.Tests.Math.Cpp/Debug
 /Unit Tests/Accord.Tests.Math.Cpp/Release
+/Unit Tests/packages
+
 /Sources/Debug
 /Sources/Release
 

.travis.yml

@@ -0,0 +1,8 @@
+language: csharp
+solution: Sources/Accord.NET.Mono.sln
+install:
+  - nuget restore Sources/Accord.NET.Mono.sln
+script:
+  - ./Build.sh framework
+  - ./Build.sh samples
+  - ./Tests.sh

Setup/Compile.cmd → Build.cmd

@@ -14,20 +14,20 @@ set DEVENV="C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\deve
 del /q "bin\*.log"
 echo.
 
-
+echo.
 echo  - Building Debug configuration...
-%DEVENV% ..\Sources\Accord.NET.sln /Rebuild Debug /out "bin\Build.Debug.log"
-
+%DEVENV% Sources\Accord.NET.sln /Rebuild Debug /out "bin\Build.Debug.log"
+echo.
 echo  - Building NET35 configuration...
-%DEVENV% ..\Sources\Accord.NET.sln /Rebuild NET35 /out "bin\Build.NET35.log"
-
+%DEVENV% Sources\Accord.NET.sln /Rebuild NET35 /out "bin\Build.NET35.log"
+echo.
 echo  - Building NET40 configuration...
-%DEVENV% ..\Sources\Accord.NET.sln /Rebuild NET40 /out "bin\Build.NET40.log"
-
+%DEVENV% Sources\Accord.NET.sln /Rebuild NET40 /out "bin\Build.NET40.log"
+echo.
 echo  - Building NET45 configuration...
-%DEVENV% ..\Sources\Accord.NET.sln /Rebuild NET45 /out "bin\Build.NET45.log"
-
+%DEVENV% Sources\Accord.NET.sln /Rebuild NET45 /out "bin\Build.NET45.log"
+echo.
 echo  - Building samples...
-%DEVENV% ..\Samples\Samples.sln /Rebuild Release /out "bin\Build.Samples.log"
-
+%DEVENV% Samples\Samples.sln /Rebuild Release /out "bin\Build.Samples.log"
+echo.
 timeout /T 5

Build.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+###########
+
+echo "                                                         "
+echo "Accord.NET Framework all projects configurations builder "
+echo "========================================================="
+echo "                                                         "
+echo "This Linux bash script will use Mono's xbuild tool to    " 
+echo "compile the Debug and Release versions of the framework. "
+echo "                                                         " 
+
+
+
+if [ $# -eq 0 ] || [ "$1" == "framework" ]; then
+	echo ""
+	echo "  - Building NET40 configuration..."
+	echo ""
+	xbuild /p:Configuration=NET40 Sources/Accord.NET.Mono.sln 
+fi
+
+if [ $# -eq 0 ] || [ "$1" == "samples" ]; then
+	echo ""
+	echo "  - Building samples..."
+	echo ""
+	xbuild /p:Configuration=Mono /p:Platform=x86 Samples/Samples.sln
+fi

Contributors.txt

@@ -7,7 +7,7 @@
  decided to share their work and contribute to its development. The 
  space below enlists a few of those people who either agreed to help
  or actively participated on its development:
-
+ 
 
   - Anders Gustafsson 
   - Antonino Porcino 
@@ -25,3 +25,27 @@
   - Mikkel Porse Rasmussen
   - Peter Sergio Larsen 
   - Remy Disp
+
+
+In May 2015, the project has been merged with the AForge.NET codebase,
+incorporating the work of even more contributors. In a true spirit of
+community, notorious previous contributors are also listed below:
+
+
+  - Andrew Kirillov (the project creator, with the best ideas)
+  - F�bio Caversan
+  - Alejandro Pirola
+  - Cezary Wagner
+  - Dale McCoy
+  - Fabio Caversan
+  - Frank Nagl
+  - Israel Lot
+  - Jeremy Noring
+  - Joan Charmant
+  - Joris Geurts
+  - Krzysztof Blacha
+  - Kyle Parrigan
+  - Markus Falkensteiner
+  - Mladen Prajdic
+  - Volodymyr Goncharov
+  - Yves Vander Haeghen

Copyright.txt

@@ -1,6 +1,6 @@
 The Accord.NET Framework
 
-Copyright (c) 2009-2015, César Roberto de Souza <cesarsouza at gmail.com>
+Copyright (c) 2009-2015, Accord.NET Authors <authors @ accord-framework.net>
 
     This library is free software; you can redistribute it and/or modify it under the terms of
     the GNU Lesser General Public License as published by the Free Software Foundation; either
@@ -31,9 +31,10 @@ Creative Commons Attribution/Share-Alike License. All referenced sections includ
 original article page. If you think you have found something which has not been properly linked, please
 let me know so it can be corrected.
 
-Overall framework architecture and style was greatly inspired by AForge.NET. The AForge.NET
-Framework is a copyrighted work by Andrew Kirillov. This framework (Accord.NET) is in no way
-affiliated with AForge.NET, its authors or contributors.
+Overall framework architecture and style was greatly inspired by AForge.NET. In May 2015, this project
+has been merged with the AForge.NET framework since public support for AForge.NET has ended. The original
+AForge.NET Framework is a copyrighted work by Andrew Kirillov, altough developed and shared under the same
+LGPL license.