Done 1.2.1-beta.

jp-diegidio · Aug 27, 2016 · 41af743 · 41af743
1 parent 32c9586
commit 41af743
Show file tree

Hide file tree

Showing 23 changed files with 182 additions and 41 deletions.
diff --git a/Code/nan_numerics_prime.pl b/Code/nan_numerics_prime.pl
@@ -82,7 +82,7 @@
 Example:
 
 	==
-	?- pack_install('nan_numerics_prime-1.2.zip').
+	?- pack_install(nan_numerics_prime).
 	true.
 	
 	?- use_module(library(nan_numerics_prime)).
@@ -94,7 +94,7 @@
 	==
 
 @author		Julio P. Di Egidio
-@version	1.2-beta
+@version	1.2.1-beta
 @copyright	2016 Julio P. Di Egidio
 @license	GNU GPLv3
 @tbd		Implement prime counting/n-th prime functions.

diff --git a/Code/nan_numerics_prime_lgc.pl b/Code/nan_numerics_prime_lgc.pl
@@ -60,7 +60,7 @@
 arguments and are not steadfast.
 
 @author		Julio P. Di Egidio
-@version	1.2-beta
+@version	1.2.1-beta
 @copyright	2016 Julio P. Di Egidio
 @license	GNU GPLv3
 @tbd		Integrate =isqrt= function from GMP?

diff --git a/Code/nan_numerics_prime_mem.pl b/Code/nan_numerics_prime_mem.pl
@@ -45,7 +45,7 @@
 *NOTE*: Predicates in this module are not meant for public use.
 
 @author		Julio P. Di Egidio
-@version	1.2-beta
+@version	1.2.1-beta
 @copyright	2016 Julio P. Di Egidio
 @license	GNU GPLv3
 @tbd		Implement size limits?

diff --git a/Code/nan_numerics_prime_pio.pl b/Code/nan_numerics_prime_pio.pl
@@ -45,7 +45,7 @@
 *NOTE*: Predicates in this module are not meant for public use.
 
 @author		Julio P. Di Egidio
-@version	1.2-beta
+@version	1.2.1-beta
 @copyright	2016 Julio P. Di Egidio
 @license	GNU GPLv3
 */

diff --git a/Code/nan_numerics_prime_prb.pl b/Code/nan_numerics_prime_prb.pl
@@ -46,7 +46,7 @@
 *NOTE*: Predicates in this module are not meant for public use.
 
 @author		Julio P. Di Egidio
-@version	1.2-beta
+@version	1.2.1-beta
 @copyright	2016 Julio P. Di Egidio
 @license	GNU GPLv3
 @tbd		Implement test error estimates?

diff --git a/Code/nan_numerics_prime_whl.pl b/Code/nan_numerics_prime_whl.pl
@@ -40,7 +40,7 @@
 *NOTE*: Predicates in this module are not meant for public use.
 
 @author		Julio P. Di Egidio
-@version	1.2-beta
+@version	1.2.1-beta
 @copyright	2016 Julio P. Di Egidio
 @license	GNU GPLv3
 */

diff --git a/Deploy/pack.bat b/Deploy/pack.bat
@@ -19,15 +19,18 @@
 :  	You should have received a copy of the GNU General Public License
 :  	along with Nan.Numerics.Prime.  If not, see <http://www.gnu.org/licenses/>.
 
-@echo off
+@rem Nan.Numerics.Prime::pack.bat (1.2.1-beta)
+@rem Author: Julio P. Di Egidio ([email protected])
+@rem Requires PowerShell 4.0 and .NET 4.5
 
-rem Requires PowerShell 4.0 and .NET 4.5
+@echo off
 
 set name=nan_numerics_prime
 set /P ver=Version ? 
 
 set infoDir=..
 set codeDir=..\Code
+set testDir=..\Tests
 set workDir=.\.work
 set targetFile=..\Publish\%name%-%ver%.zip
 
@@ -45,16 +48,24 @@ echo Copying prolog...
 
 xcopy /Q "%codeDir%\*.*" "%workDir%\prolog\"
 
+echo Copying test...
+
+xcopy /Q "%testDir%\*.*" "%workDir%\test\"
+
 echo Generating target...
 
 if exist "%targetFile%" (
 	del "%targetFile%"
 )
 
-PowerShell ^
-	-NoLogo -NonInteractive -NoProfile ^
-	-ExecutionPolicy Bypass ^
-	-File ".\zipDir.ps1" "%workDir%" "%targetFile%"
+if exist "%targetFile%" (
+	pause
+) else (
+	PowerShell ^
+		-ExecutionPolicy Bypass ^
+		-NoLogo -NoProfile ^
+		-File ".\zipDir.ps1" "%workDir%" "%targetFile%"
+)
 
 echo Cleaning up...
 

diff --git a/Deploy/zipDir.ps1 b/Deploy/zipDir.ps1
@@ -1,5 +1,5 @@
 <#	Nan.Windows.Scripts
-	Windows PowerShell Scripts.
+	Windows Shell Scripts
 	Copyright 2016 Julio P. Di Egidio
 	<mailto:[email protected]>
 	<http://julio.diegidio.name/Projects/Nan.Windows.Scripts/>
@@ -13,22 +13,22 @@
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #>
 
-# Usage: zipDir.ps1 <sourceDir> <targetZipFile>
+# Nan.Windows.Scripts::zipDir.ps1 (1.2.1)
+# Author: Julio P. Di Egidio ([email protected])
+# Usage: $ zipDir.ps1 <sourceDir> <targetFile>
 # Adapted from http://stackoverflow.com/a/27289116
 # Requires PowerShell 4.0 and .NET 4.5
+# NOTE: Requires PS option ExecutionPolicy=Bypass
 
 $peTypeSource = @'
 	using System.Text;
-	namespace Nan.Windows.Scripts
-	{
-		public class PathEncoder : UTF8Encoding
-		{
+	namespace Nan.Windows.Scripts {
+		public class PathEncoder : UTF8Encoding {
 			public PathEncoder() {}
-			public override byte[] GetBytes(string s)
-			{
+			public override byte[] GetBytes(string s) {
 				s = s.Replace("\\", "/");
 				return base.GetBytes(s);
-		   }
+			}
 		}
 	}
 '@

diff --git a/HISTORY b/HISTORY
@@ -0,0 +1,17 @@
+Nan.Numerics.Prime
+A simple prime number library
+Copyright 2016 Julio P. Di Egidio
+Licensed under GNU GPLv3.
+http://julio.diegidio.name/Projects/Nan.Numerics.Prime/
+https://github.com/jp-diegidio/Nan.Numerics.Prime-Prolog/
+
+Version 1.2.1-beta:
+-------------------
+- Integration of tests into SWI pack system.
+- Bundled Nan.Windows.Scripts (1.2.1).
+- Few non-critical code improvements.
+- Created history file.
+
+Version 1.2-beta:
+-----------------
+- Tagged version 1.2-beta.
diff --git a/Publish/nan_numerics_prime-1.2.1.zip b/Publish/nan_numerics_prime-1.2.1.zip
diff --git a/README b/README
@@ -1,4 +1,4 @@
-Nan.Numerics.Prime 1.2-beta
+Nan.Numerics.Prime (1.2.1-beta)
 A simple prime number library
 Copyright 2016 Julio P. Di Egidio
 Licensed under GNU GPLv3.
@@ -24,12 +24,12 @@ call the _unsafe_ =public= (not exported) predicates in sub-module
 library is not suitable for cryptographic applications.
 
 This library was developed and tested with:
-SWI-Prolog 7.3.24: http://www.swi-prolog.org/
+SWI-Prolog 7.3.24 - http://www.swi-prolog.org/
 
 Example:
 
 	==
-	?- pack_install('nan_numerics_prime-1.2.zip').
+	?- pack_install(nan_numerics_prime).
 	true.
 
 	?- use_module(library(nan_numerics_prime)).

diff --git a/Resources/Nan.Windows.Scripts-1.2.1.zip b/Resources/Nan.Windows.Scripts-1.2.1.zip
diff --git a/Tests/debug.pl b/Tests/debug.pl
@@ -22,13 +22,23 @@
 */
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-:- module(debug_, []).
+/** <file> A simple prime number library :: debug
+
+@author		Julio P. Di Egidio
+@version	1.2.1-beta
+@copyright	2016 Julio P. Di Egidio
+@license	GNU GPLv3
+*/
 
 :- use_module(library(doc_http)).
 
 :- doc_server(4000, [edit(false)]).
 :- portray_text(true).
 
+:- if(exists_file('../Code/nan_numerics_prime.pl')).
 :- consult('../Code/nan_numerics_prime').
+:- else.
+:- consult('../prolog/nan_numerics_prime').
+:- endif.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Tests/prime.test.pl b/Tests/prime.test.pl
@@ -22,11 +22,20 @@
 */
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+/** <test> A simple prime number library
+
+@author		Julio P. Di Egidio
+@version	1.2.1-beta
+@copyright	2016 Julio P. Di Egidio
+@license	GNU GPLv3
+*/
+
 % (SWI-Prolog 7.3.24)
 
 :- use_module(library(plunit)).
 
-:- use_module('../Code/nan_numerics_prime').
+:- ensure_loaded(test_inc).
+:- test_module('nan_numerics_prime.pl').
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -220,7 +229,6 @@
 	true((C, H) == (TC0, TH))
 ]) :-
 	prime_save_file(File, 100), write(w),
-	prime_mem_clear,
 	prime_load_file(File), write(r),
 	prime_mem_count(C),
 	prime_mem:max_(H).
@@ -235,7 +243,6 @@
 	true((C, H) == (TC0, TH))
 ]) :-
 	prime_save_file(File, 1000), write(w),
-	prime_mem_clear,
 	prime_load_file(File), write(r),
 	prime_mem_count(C),
 	prime_mem:max_(H).
@@ -250,7 +257,6 @@
 	true((C, H) == (TC0, TH))
 ]) :-
 	prime_save_file(File, 1000), write(w),
-	prime_mem_clear,
 	prime_load_file(File, 100), write(r),
 	prime_mem_count(C),
 	prime_mem:max_(H).
@@ -265,7 +271,6 @@
 	true((C, H) == (TC0, TH))
 ]) :-
 	prime_save_file(File, 1000), write(w),
-	prime_mem_clear,
 	prime_load_file(File, TH), write(r),
 	prime_mem_count(C),
 	prime_mem:max_(H).

diff --git a/Tests/prime_lgc.test.pl b/Tests/prime_lgc.test.pl
@@ -22,11 +22,20 @@
 */
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+/** <test> A simple prime number library :: logic
+
+@author		Julio P. Di Egidio
+@version	1.2.1-beta
+@copyright	2016 Julio P. Di Egidio
+@license	GNU GPLv3
+*/
+
 % (SWI-Prolog 7.3.24)
 
 :- use_module(library(plunit)).
 
-:- use_module('../Code/nan_numerics_prime_lgc').
+:- ensure_loaded(test_inc).
+:- test_module('nan_numerics_prime_lgc.pl').
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

diff --git a/Tests/prime_mem.test.pl b/Tests/prime_mem.test.pl
@@ -22,11 +22,20 @@
 */
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+/** <test> A simple prime number library :: memoization
+
+@author		Julio P. Di Egidio
+@version	1.2.1-beta
+@copyright	2016 Julio P. Di Egidio
+@license	GNU GPLv3
+*/
+
 % (SWI-Prolog 7.3.24)
 
 :- use_module(library(plunit)).
 
-:- use_module('../Code/nan_numerics_prime_mem').
+:- ensure_loaded(test_inc).
+:- test_module('nan_numerics_prime_mem.pl').
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

diff --git a/Tests/prime_pio.test.pl b/Tests/prime_pio.test.pl
@@ -22,11 +22,20 @@
 */
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+/** <test> A simple prime number library :: pure I/O
+
+@author		Julio P. Di Egidio
+@version	1.2.1-beta
+@copyright	2016 Julio P. Di Egidio
+@license	GNU GPLv3
+*/
+
 % (SWI-Prolog 7.3.24)
 
 :- use_module(library(plunit)).
 
-:- use_module('../Code/nan_numerics_prime_pio').
+:- ensure_loaded(test_inc).
+:- test_module('nan_numerics_prime_pio.pl').
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

diff --git a/Tests/prime_prb.test.pl b/Tests/prime_prb.test.pl
@@ -22,11 +22,20 @@
 */
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+/** <test> A simple prime number library :: probabilistic
+
+@author		Julio P. Di Egidio
+@version	1.2.1-beta
+@copyright	2016 Julio P. Di Egidio
+@license	GNU GPLv3
+*/
+
 % (SWI-Prolog 7.3.24)
 
 :- use_module(library(plunit)).
 
-:- use_module('../Code/nan_numerics_prime_prb').
+:- ensure_loaded(test_inc).
+:- test_module('nan_numerics_prime_prb.pl').
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

diff --git a/Tests/prime_whl.test.pl b/Tests/prime_whl.test.pl
@@ -22,11 +22,20 @@
 */
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+/** <test> A simple prime number library :: wheel
+
+@author		Julio P. Di Egidio
+@version	1.2.1-beta
+@copyright	2016 Julio P. Di Egidio
+@license	GNU GPLv3
+*/
+
 % (SWI-Prolog 7.3.24)
 
 :- use_module(library(plunit)).
 
-:- use_module('../Code/nan_numerics_prime_whl').
+:- ensure_loaded(test_inc).
+:- test_module('nan_numerics_prime_whl.pl').
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

diff --git a/Tests/session.txt b/Tests/session.txt
@@ -1,9 +1,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-?- pack_install('../prolog/nan_numerics_prime').
-?- use_module('../prolog/nan_numerics_prime').
+?- pack_install('<path>/nan_numerics_prime-<ver>.zip').
 
 ?- pack_install(nan_numerics_prime).
+
 ?- use_module(library(nan_numerics_prime)).
 
 ?- prime_mem_clear.