From d59676c60dd2fa5c089a3cf01b162b7122dd524d Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 27 Dec 2024 18:03:53 -0500 Subject: [PATCH] Rename Combinatorica files Package names should not have "." in them. so V0.6.m is now V06.m Seconds combinatorica v09.m is v.91.m since some code has changed. --- ...CombinatoricaV0.6.m => CombinatoricaV06.m} | 0 ...ombinatoricaV0.9.m => CombinatoricaV091.m} | 2 +- ...binatoricaV2.0.0.m => CombinatoricaV200.m} | 0 Combinatorica/Kernel/init.m | 24 +++++++++++++++---- ...rica_v09.py => test_combinatorica_v091.py} | 5 +++- test/test_combinatorica_v20.py | 2 +- 6 files changed, 25 insertions(+), 8 deletions(-) rename Combinatorica/{CombinatoricaV0.6.m => CombinatoricaV06.m} (100%) rename Combinatorica/{CombinatoricaV0.9.m => CombinatoricaV091.m} (99%) rename Combinatorica/{CombinatoricaV2.0.0.m => CombinatoricaV200.m} (100%) rename test/{test_combinatorica_v09.py => test_combinatorica_v091.py} (99%) diff --git a/Combinatorica/CombinatoricaV0.6.m b/Combinatorica/CombinatoricaV06.m similarity index 100% rename from Combinatorica/CombinatoricaV0.6.m rename to Combinatorica/CombinatoricaV06.m diff --git a/Combinatorica/CombinatoricaV0.9.m b/Combinatorica/CombinatoricaV091.m similarity index 99% rename from Combinatorica/CombinatoricaV0.9.m rename to Combinatorica/CombinatoricaV091.m index f1e0a2f..9c4511c 100644 --- a/Combinatorica/CombinatoricaV0.9.m +++ b/Combinatorica/CombinatoricaV091.m @@ -83,7 +83,7 @@ (* :Mathematica Version: 2.3, Mathics3 version 7.0.0 *) -BeginPackage["DiscreteMath`CombinatoricaV0.91`"] +BeginPackage["DiscreteMath`CombinatoricaV091`"] Graph::usage = "Graph[g,v] is the header for a graph object where g is an adjacency matrix and v is a list of vertices." diff --git a/Combinatorica/CombinatoricaV2.0.0.m b/Combinatorica/CombinatoricaV200.m similarity index 100% rename from Combinatorica/CombinatoricaV2.0.0.m rename to Combinatorica/CombinatoricaV200.m diff --git a/Combinatorica/Kernel/init.m b/Combinatorica/Kernel/init.m index 4e25a13..6faaa46 100644 --- a/Combinatorica/Kernel/init.m +++ b/Combinatorica/Kernel/init.m @@ -1,5 +1,7 @@ (* -*- wolfram -*- *) -(* DiscreteMath`CombinatoricaV0.9 goes with: +Get[ "Combinatorica`CombinatoricaV06" ] + +(* DiscreteMath`CombinatoricaV091 goes with: Implementing Discrete Mathematics: Combinatorics and Graph Theory with Mathematica @@ -9,7 +11,19 @@ by Steven S. Skiena, Addison-Wesley Publishing Co., Advanced Book Program, 350 Bridge Parkway, Redwood City CA 94065. ISBN 0-201-50943-1. For ordering information, call 1-800-447-2226. - *) -Get[ "Combinatorica`CombinatoricaV0.6" ] -Get[ "Combinatorica`CombinatoricaV0.9" ] -Get[ "Combinatorica`CombinatoricaV2.0.0" ] +*) +Get[ "Combinatorica`CombinatoricaV09" ] + +(* DiscreteMath`CombinatoricaV200 goes with: + +the programs from the book: + +"Computational +Discrete Mathematics: Combinatorics and Graph Theory in Mathematica", +by Sriram V. Pemmaraju and Steven S. Skiena, Cambridge University Press, +2003. + +The programs from the book are also available at www.combinatorica.com. +*) + +Get[ "Combinatorica`CombinatoricaV200" ] diff --git a/test/test_combinatorica_v09.py b/test/test_combinatorica_v091.py similarity index 99% rename from test/test_combinatorica_v09.py rename to test/test_combinatorica_v091.py index b340bfd..6e7332e 100644 --- a/test/test_combinatorica_v09.py +++ b/test/test_combinatorica_v091.py @@ -10,7 +10,10 @@ _initialized: bool = False combinatorica_file = osp.normpath( - osp.join(osp.dirname(__file__), "..", "Combinatorica", "CombinatoricaV0.9.m") + osp.join(osp.dirname(__file__), + "..", + "Combinatorica", + "CombinatoricaV091.m") ) diff --git a/test/test_combinatorica_v20.py b/test/test_combinatorica_v20.py index de9fbac..10cdd6b 100644 --- a/test/test_combinatorica_v20.py +++ b/test/test_combinatorica_v20.py @@ -12,7 +12,7 @@ combinatorica_file = osp.normpath( osp.join(osp.dirname(__file__), "..", "Combinatorica", - "CombinatoricaV2.0.0.m") + "CombinatoricaV200.m") )