[Pntool-developers] SF.net SVN: pntool:[179] spnbox
Brought to you by:
compaqdrew,
miordache
Menu
▾
▴
[Pntool-developers] SF.net SVN: pntool:[179] spnbox
|
From: <Ste...@us...> - 2009-07-07 05:53:08
|
Revision: 179
http://pntool.svn.sourceforge.net/pntool/?rev=179&view=rev
Author: StephenCamp
Date: 2009-07-07 05:53:03 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
Added structure deallocation functions in deallocation.c
Replaced individual test makefiles with a makefile for all test routines.
Fixed bugs in actn.c and tactn.c. tactn.c is NOT fully debugged yet - at least one known error has yet to be resolved.
Modified Paths:
--------------
spnbox/actn.c
spnbox/spnbox.h
spnbox/tactn.c
spnbox/tests/test-tactn.txt
Added Paths:
-----------
spnbox/deallocation.c
spnbox/tests/Makefile
Removed Paths:
-------------
spnbox/tests/test-actn.mak
spnbox/tests/test-ilpadm.mak
spnbox/tests/test-ipsolve.mak
spnbox/tests/test-isadm.mak
spnbox/tests/test-linenf.mak
spnbox/tests/test-msplit.mak
spnbox/tests/test-nltrans.mak
spnbox/tests/test-pn2acpn.mak
spnbox/tests/test-pn2eacpn.mak
spnbox/tests/test-reduce.mak
spnbox/tests/test-supervis.mak
spnbox/tests/test-tactn.mak
Modified: spnbox/actn.c
===================================================================
--- spnbox/actn.c 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/actn.c 2009-07-07 05:53:03 UTC (rev 179)
@@ -10,7 +10,7 @@
static actn_r BuildResult(matrix* Dm, matrix* Dp, int* cullPlace, int* cullTrans);
-static int* cullPlaces(matrix* Dm, int* cullTransition);
+static int* cullPlaces(matrix* Dp, int* cullTransition);
static int* updateURT(matrix* Dm, matrix* Dp, matrix* Dcm, matrix* Dcp);
@@ -65,8 +65,8 @@
ManageMemory(&memory, cullTransition);
/*Build the cullPlace flags, which will be cleared only for places that
- have nonzero output arcs to transitions that are not being culled.*/
- cullPlace = cullPlaces(Dm, cullTransition);
+ have nonzero input arcs from transitions that are not being culled.*/
+ cullPlace = cullPlaces(Dp, cullTransition);
ManageMemory(&memory, cullPlace);
/*Build the final output.*/
@@ -236,27 +236,27 @@
returns an array of integer flags, one for each place, indicating whether that
place should be culled.
*/
-int* cullPlaces(matrix* Dm, int* cullTransition)
+int* cullPlaces(matrix* Dp, int* cullTransition)
{
int i, j;
int *cull;
/*Allocate and initialize the return value cull. It will be clear only for
places that have nonzero output arcs to transitions that are not being
culled.*/
- cull = tcalloc(NumberOfRows(*Dm), sizeof(int));
- for (i = 0; i < NumberOfRows(*Dm); i++)
+ cull = tcalloc(NumberOfRows(*Dp), sizeof(int));
+ for (i = 0; i < NumberOfRows(*Dp); i++)
{
/*Look to see if the current place has any nonzero output arcs to
transitions not being culled.*/
- for (j = 0; j < NumberOfColumns(*Dm); j++)
+ for (j = 0; j < NumberOfColumns(*Dp); j++)
{
- if (GetMatrixEl(Dm, i, j) && (! cullTransition[j]))
+ if (GetMatrixEl(Dp, i, j) && (! cullTransition[j]))
{
break;
}
}
/*If there were no nonzero output arcs set the place flag.*/
- if (j == NumberOfColumns(*Dm))
+ if (j == NumberOfColumns(*Dp))
{
cull[i] = 1;
}
Added: spnbox/deallocation.c
===================================================================
--- spnbox/deallocation.c (rev 0)
+++ spnbox/deallocation.c 2009-07-07 05:53:03 UTC (rev 179)
@@ -0,0 +1,147 @@
+#include "../pnheaders/matrix.h"
+#include "spnbox.h"
+
+inline static void FreeMatrixSafe(matrix* m)
+{
+ /*If type is zero, it means the matrix hasn't been allocated.*/
+ if (m->type) DeallocateMatrix(m);
+}
+
+inline static void FreeMemorySafe(void* m)
+{
+ /*Don't attempt to free a non-null pointer.*/
+ if (m) free(m);
+}
+
+void DeallocateSupervise(supervis_r *data)
+{
+ FreeMatrixSafe(&data->Dfm);
+ FreeMatrixSafe(&data->Dfp);
+ memset(data, 0, sizeof(supervis_r));
+}
+
+void DeallocateIpslv(ipslv_r *data)
+{
+ FreeMemorySafe(data->solution);
+ memset(data, 0, sizeof(ipslv_r));
+}
+
+void DeallocateIpsolve(ipsolve_r *data)
+{
+ FreeMemorySafe(data->res);
+ memset(data, 0, sizeof(ipsolve_r));
+}
+
+void DeallocateIlpadm(ilpadm_r *data)
+{
+ FreeMatrixSafe(&data->La);
+ FreeMatrixSafe(&data->R1);
+ FreeMatrixSafe(&data->R2);
+ FreeMemorySafe(&data->ba);
+ FreeMemorySafe(&data->dhow);
+ memset(data, 0, sizeof(ilpadm));
+}
+
+void DeallocateLinenf(linenf_r *data)
+{
+ FreeMatrixSafe(&data->Dfm);
+ FreeMatrixSafe(&data->Dfp);
+ FreeMatrixSafe(&data->Lf);
+ FreeMatrixSafe(&data->Cf);
+ FreeMemorySafe(data->ms0);
+ FreeMemorySafe(data->dhow);
+ FreeMemorySafe(data->bf);
+ memset(data, 0, sizeof(linenf_r));
+}
+
+void DeallocateMsplit(msplit_r *data)
+{
+ int i;
+ if (data->Df.type && data->TDf)
+ {
+ for (i = 0; i < NumberOfColumns(data->Df); i++)
+ {
+ FreeMemorySafe(data->TDf[i]);
+ }
+ }
+ FreeMemorySafe(data->TDf);
+ FreeMemorySafe(data->iplf);
+ FreeMemorySafe(data->TDfCount);
+ FreeMatrixSafe(&data->Df);
+ FreeMatrixSafe(&data->Dfm);
+ FreeMatrixSafe(&data->Dfp);
+ FreeMatrixSafe(&data->Mf);
+ FreeMatrixSafe(&data->L0f);
+ FreeMatrixSafe(&data->Lf);
+ memset(data, 0, sizeof(msplit_r));
+}
+
+void DeallocateNltrans(nltrans_r *data)
+{
+ FreeMemorySafe(data->dtr);
+ memset(data, 0, sizeof(nltrans_r));
+}
+
+void DeallocatePn2acpn(pn2acpn_r *data)
+{
+ FreeMatrixSafe(&data->Df);
+ FreeMatrixSafe(&data->Dmf);
+ FreeMatrixSafe(&data->Dpf);
+ FreeMatrixSafe(&data->MXF);
+ FreeMatrixSafe(&data->L0F);
+ FreeMatrixSafe(&data->LF);
+ FreeMemorySafe(data->iplf);
+ memset(data, 0, sizeof(pn2acpn_r));
+}
+
+void DeallocatePn2eacpn(pn2eacpn_r *data)
+{
+ int i;
+ if (data->Df.type && data->TD)
+ {
+ for (i = 0; i < NumberOfColumns(data->Df); i++)
+ {
+ FreeMemorySafe(data->TD[i]);
+ }
+ }
+ FreeMemorySafe(data->TD);
+ FreeMemorySafe(data->TDCount);
+ FreeMemorySafe(data->iplf);
+
+ FreeMatrixSafe(&data->Df);
+ FreeMatrixSafe(&data->Dmf);
+ FreeMatrixSafe(&data->Dpf);
+ FreeMatrixSafe(&data->MXF);
+ FreeMatrixSafe(&data->L0F);
+ FreeMatrixSafe(&data->LF);
+ memset(data, 0, sizeof(pn2eacpn_r));
+}
+
+void DeallocateChkcons(chkcons_r *data)
+{
+ FreeMemorySafe(data->res);
+ memset(data, 0, sizeof(chkcons_r));
+}
+
+void DeallocateReduce(reduce_r *data)
+{
+ FreeMatrixSafe(&data->Lf);
+ FreeMemorySafe(data->Bf);
+ FreeMemorySafe(data->indf);
+ memset(data, 0, sizeof(reduce_r));
+}
+
+void DeallocateActn(actn_r *data)
+{
+ FreeMatrixSafe(&data->Dma);
+ FreeMatrixSafe(&data->Dpa);
+ FreeMatrixSafe(&data->Dmra);
+ FreeMatrixSafe(&data->Dpra);
+ FreeMemorySafe(data->TA);
+ memset(data, 0, sizeof(actn_r));
+}
+
+void DeallocateTactn(tactn_r *data)
+{
+ DeallocateTactn(data);
+}
Modified: spnbox/spnbox.h
===================================================================
--- spnbox/spnbox.h 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/spnbox.h 2009-07-07 05:53:03 UTC (rev 179)
@@ -126,6 +126,21 @@
type just for consistency's sake.*/
typedef actn_r tactn_r;
+/*Functions to free return structures. Implemented in deallocation.c*/
+void DeallocateSupervise(supervis_r *data);
+void DeallocateIpslv(ipslv_r *data);
+void DeallocateIpsolve(ipsolve_r *data);
+void DeallocateIlpadm(ilpadm_r *data);
+void DeallocateLinenf(linenf_r *data);
+void DeallocateMsplit(msplit_r *data);
+void DeallocateNltrans(nltrans_r *data);
+void DeallocatePn2acpn(pn2acpn_r *data);
+void DeallocatePn2eacpn(pn2eacpn_r *data);
+void DeallocateChkcons(chkcons_r *data);
+void DeallocateReduce(reduce_r *data);
+void DeallocateActn(actn_r *data);
+void DeallocateTactn(tactn_r *data);
+
/*Constants returned in by functions to indicate the nature of the result.*/
#define HOW_ERROR "error"
#define HOW_OK "OK"
Modified: spnbox/tactn.c
===================================================================
--- spnbox/tactn.c 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tactn.c 2009-07-07 05:53:03 UTC (rev 179)
@@ -14,7 +14,7 @@
static int* maxactn(matrix *D, int *IncludeFlag, int *ExcludeFlag);
-static int* keepPlaces(matrix* Dm, int* keepTransition);
+static int* keepPlaces(matrix* Dp, int* keepTransition);
static tactn_r BuildResult(matrix* Dm, matrix* Dp, int* cullPlace, int* cullTrans);
@@ -53,7 +53,7 @@
}
for (i = 0; i < ExcludeTCount; i++)
{
- ExcludeFlag[IncludeT[i]] = 1;
+ ExcludeFlag[ExcludeT[i]] = 1;
}
if (Dcm && Dcp)
@@ -79,9 +79,9 @@
}
ManageMemory(&memory, keepTransition);
- /*Build the cullPlace flags, which will be cleared only for places that
- have nonzero output arcs to transitions that are not being culled.*/
- keepPlace = keepPlaces(Dm, keepTransition);
+ /*Build the keepPlace flags, which will be set only for places that
+ have nonzero input arcs from transitions that are being kept.*/
+ keepPlace = keepPlaces(Dp, keepTransition);
ManageMemory(&memory, keepPlace);
/*Build the final output.*/
@@ -256,21 +256,21 @@
keepPlaces examines the Petri net and the list of transitions to keep and
returns an array of integer flags, one for each place, indicating whether that
place should be kept.*/
-int* keepPlaces(matrix* Dm, int* keepTransition)
+int* keepPlaces(matrix* Dp, int* keepTransition)
{
int i, j;
int *keep;
/*Allocate and initialize the return value cull. It will be clear only for
places that have nonzero output arcs to transitions that are not being
culled.*/
- keep = tcalloc(NumberOfRows(*Dm), sizeof(int));
- for (i = 0; i < NumberOfRows(*Dm); i++)
+ keep = tcalloc(NumberOfRows(*Dp), sizeof(int));
+ for (i = 0; i < NumberOfRows(*Dp); i++)
{
/*Look to see if the current place has any nonzero output arcs to
transitions being kept.*/
- for (j = 0; j < NumberOfColumns(*Dm); j++)
+ for (j = 0; j < NumberOfColumns(*Dp); j++)
{
- if (GetMatrixEl(Dm, i, j) && (keepTransition[j]))
+ if (GetMatrixEl(Dp, i, j) && (keepTransition[j]))
{
keep[i] = 1;
break;
@@ -311,7 +311,7 @@
/*Allocate space*/
mem = CreateMemoryManager(5, 1, 0, 0);
- MAllocateMatrixType(&mem, 2, &L, DRows + 1, DCols + 1);
+ MAllocateMatrixType(&mem, 2, &L, DRows + 1, DCols);
IntList = mcalloc(&mem, DCols, sizeof(short));
B = mcalloc(&mem, DRows + 1, sizeof(double));
oldFlag = mcalloc(&mem, DCols, sizeof(int));
@@ -340,7 +340,7 @@
{
if (newFlag[i] && (! oldFlag[i]))
{
- CopyBlock(DRows, 0, D, 0, i, &L, 0, i);
+ CopyBlock(DRows, 1, D, 0, i, &L, 0, i);
SetMatrixEl(&L, DRows, i, 1);
}
else if ((! newFlag[i]) && oldFlag[i])
@@ -756,11 +756,11 @@
and vice-versa.*/
if (! *IncludeT)
{
- *ExcludeTCount = 0;
+ *IncludeTCount = 0;
}
- else if (! *ExcludeTCount)
+ else if (! *IncludeTCount)
{
- *ExcludeT = 0;
+ *IncludeT = 0;
}
/*If IncludeT was not given it defaults to including the indices of every
transitions.*/
Added: spnbox/tests/Makefile
===================================================================
--- spnbox/tests/Makefile (rev 0)
+++ spnbox/tests/Makefile 2009-07-07 05:53:03 UTC (rev 179)
@@ -0,0 +1,139 @@
+#Usage:
+# make all | clean | <functionname>
+#all builds all test routines and executables.
+#clean cleans the test routine executables and intermediate files.
+#<functionname> is the name of an spnbox function. This builds the test routines for that function.
+
+COMPILER=gcc -g
+
+#The dependencies common to all test executables.
+COMMON=StructuredIO.o test.o MemoryManager.o general.o pns.o matrix.o matrixmath.o
+
+#These symbols define the dependencies of various test executables.
+IPSOLVE=ipsolve.o ipslv.o ../liblpsolve55.a
+ISADM=isadm.o
+MSPLIT=msplit.o
+PN2ACPN=pn2acpn.o
+SUPERVIS=supervis.o
+ACTN=actn.o $(NLTRANS)
+ILPADM=ilpadm.o $(IPSOLVE)
+LINENF=linenf.o $(ILPADM)
+NLTRANS=nltrans.o $(IPSOLVE)
+PN2EACPN=pn2eacpn.o $(NLTRANS)
+REDUCE=reduce.o chkcons.o $(IPSOLVE)
+TACTN=tactn.o $(IPSOLVE)
+
+#All test dependencies.
+ALL=$(COMMON) $(IPSOLVE) isadm.o msplit.o pn2acpn.o actn.o ilpadm.o linenf.o nltrans.o pn2eacpn.o reduce.o chkcons.o tactn.o
+ALLSRC=isolve.c ipslv.c isadm.c msplit.c pn2acpn.c supervis.c actn.c ilpadm.c linenf.c nltrans.c pn2eacpn.c reduce.c chkcons.c tactn.c
+
+#Common test header dependencies.
+COMMONHEADER=spnbox.h test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../MemoryManager.h StructuredIO.h
+
+#Targets
+all: ipsolve isadm msplit pn2acpn supervis actn ilpadm linenf nltrans pn2eacpn reduce tactn
+ipsolve: test-ipsolve.o $(COMMON) $(IPSOLVE)
+ $(COMPILER) -o ipsolve.exe test-ipsolve.o $(COMMON) $(IPSOLVE)
+isadm: test-isadm.o $(ISADM)
+ $(COMPILER) -o isadm.exe test-isadm.o $(COMMON) $(ISADM)
+msplit: test-msplit.o $(MSPLIT)
+ $(COMPILER) -o msplit.exe test-msplit.o $(COMMON) $(MSPLIT)
+pn2acpn: test-pn2acpn.o $(COMMON) $(PN2ACPN)
+ $(COMPILER) -o pn2acpn.exe test-pn2acpn.o $(COMMON) $(PN2ACPN)
+supervis: test-supervis.o $(COMMON) $(SUPERVIS)
+ $(COMPILER) -o supervis.exe test-supervis.o $(COMMON) $(SUPERVIS)
+actn: test-actn.o $(COMMON) $(ACTN)
+ $(COMPILER) -o actn.exe test-actn.o $(COMMON) $(ACTN)
+ilpadm: test-ilpadm.o $(COMMON) $(ILPADM)
+ $(COMPILER) -o ilpadm.exe test-ilpadm.o $(COMMON) $(ILPADM)
+linenf: test-linenf.o $(COMMON) $(LINENF)
+ $(COMPILER) -o linenf.exe test-linenf.o $(COMMON) $(LINENF)
+nltrans: test-nltrans.o $(COMMON) $(NLTRANS)
+ $(COMPILER) -o nltrans.exe test-nltrans.o $(COMMON) $(NLTRANS)
+pn2eacpn: test-pn2eacpn.o $(COMMON) $(PN2EACPN)
+ $(COMPILER) -o pn2eacpn.exe test-pn2eacpn.o $(COMMON) $(PN2EACPN)
+reduce: test-reduce.o $(COMMON) $(REDUCE)
+ $(COMPILER) -o reduce.exe test-reduce.o $(COMMON) $(REDUCE)
+tactn: test-tactn.o $(COMMON) $(TACTN)
+ $(COMPILER) -o tactn.exe test-tactn.o $(COMMON) $(TACTN)
+clean:
+ rm -f *.o
+ rm -f *.exe
+ rm -f *.stackdump
+
+#Rules for making the general object files.
+actn.o: ../actn.c ../spnbox.h ../../pnheaders/matrix.h ../../pnheaders/pns.h ../matrixmath.h ../MemoryManager.h
+ $(COMPILER) -c ../actn.c
+chkcons.o: ../spnbox.h ../../pnheaders/matrix.h ../../pnheaders/pns.h ../chkcons.c
+ $(COMPILER) -c ../chkcons.c
+general.o: ../../pnheaders/general.c ../../pnheaders/general.h
+ $(COMPILER) -c ../../pnheaders/general.c
+ilpadm.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ilpadm.c
+ $(COMPILER) -c ../ilpadm.c
+isadm.o: ../isadm.c ../spnbox.h ../../pnheaders/general.h ../MemoryManager.h ../../pnheaders/pns.h ../matrixmath.h
+ $(COMPILER) -c ../isadm.c
+ipslv.o: ../spnbox.h ../ipslv.c
+ $(COMPILER) -c ../ipslv.c
+ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
+ $(COMPILER) -c ../ipsolve.c
+linenf.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../linenf.c
+ $(COMPILER) -c ../linenf.c
+matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
+ $(COMPILER) -c ../../pnheaders/matrix.c
+matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
+ $(COMPILER) -c ../matrixmath.c
+MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
+ $(COMPILER) -c ../MemoryManager.c
+msplit.o: ../spnbox.h ../../pnheaders/matrix.h ../matrixmath.h ../MemoryManager.h ../msplit.c
+ $(COMPILER) -c ../msplit.c
+nltrans.o: ../nltrans.c ../spnbox.h ../../pnheaders/matrix.h ../matrixmath.h ../MemoryManager.h
+ $(COMPILER) -c ../nltrans.c
+pn2acpn.o: ../spnbox.h ../../pnheaders/matrix.h ../MemoryManager.h ../pn2acpn.c
+ $(COMPILER) -c ../pn2acpn.c
+pn2eacpn.o: ../spnbox.h ../../pnheaders/matrix.h ../MemoryManager.h ../pn2eacpn.c
+ $(COMPILER) -c ../pn2eacpn.c
+pns.o: ../../pnheaders/pns.c ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
+ $(COMPILER) -c ../../pnheaders/pns.c
+reduce.o: ../spnbox.h ../../pnheaders/matrix.h ../reduce.c
+ $(COMPILER) -c ../reduce.c
+supervis.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/ ../../pnheaders/matrix.h ../supervis.c
+ $(COMPILER) -c ../supervis.c
+StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
+ $(COMPILER) -c StructuredIO.c
+tactn.o: ../tactn.c ../spnbox.h ../../pnheaders/matrix.h ../../pnheaders/pns.h ../matrixmath.h ../MemoryManager.h
+ $(COMPILER) -c ../tactn.c
+test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
+ $(COMPILER) -c test.c
+
+#Rules for making the test executable object files.
+test-actn.o: test-actn.c $(COMMONHEADERS)
+ $(COMPILER) -c test-actn.c
+test-ilpadm.o: test-ilpadm.c $(COMMONHEADERS)
+ $(COMPILER) -c test-ilpadm.c
+test-ipsolve.o: test-ipsolve.c $(COMMONHEADERS)
+ $(COMPILER) -c test-ipsolve.c
+test-isadm.o: test-isadm.c $(COMMONHEADERS)
+ $(COMPILER) -c test-isadm.c
+test-linenf.o: test-linenf.c $(COMMONHEADERS)
+ $(COMPILER) -c test-linenf.c
+test-msplit.o: test-msplit.c $(COMMONHEADERS)
+ $(COMPILER) -c test-msplit.c
+test-nltrans.o: test-nltrans.c $(COMMONHEADERS)
+ $(COMPILER) -c test-nltrans.c
+test-pn2acpn.o: test-pn2acpn.c $(COMMONHEADERS)
+ $(COMPILER) -c test-pn2acpn.c
+test-pn2eacpn.o: test-pn2eacpn.c $(COMMONHEADERS)
+ $(COMPILER) -c test-pn2eacpn.c
+test-supervis.o: test-supervis.c $(COMMONHEADERS)
+ $(COMPILER) -c test-supervis.c
+test-reduce.o: test-reduce.c $(COMMONHEADERS)
+ $(COMPILER) -c test-reduce.c
+test-tactn.o: test-tactn.c $(COMMONHEADERS)
+ $(COMPILER) -c test-tactn.c
+
+#Rules for making the liblpsolve55.a static library for use with ipsolve.
+../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
+ cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
+
+../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
+ cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
\ No newline at end of file
Deleted: spnbox/tests/test-actn.mak
===================================================================
--- spnbox/tests/test-actn.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-actn.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,46 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-actn: test-actn.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o StructuredIO.o nltrans.o actn.o test.o ../liblpsolve55.a
- $(COMPILER) -o test-actn.exe pns.o matrix.o general.o matrixmath.o test-actn.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o nltrans.o actn.o test.o ../liblpsolve55.a
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-pns.o: ../../pnheaders/pns.h ../../pnheaders/pns.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-general.o: ../../pnheaders/general.h ../../pnheaders/general.c
- $(COMPILER) -c ../../pnheaders/general.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
- $(COMPILER) -c ../ipsolve.c
-
-ipslv.o: ../spnbox.h ../ipslv.c
- $(COMPILER) -c ../ipslv.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-test-actn.o: test-actn.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-actn.c
-
-StructuredIO.o: StructuredIO.c StructuredIO.h ../../pnheaders/matrix.h
- $(COMPILER) -c StructuredIO.c
-
-nltrans.o: ../nltrans.c ../spnbox.h ../../pnheaders/matrix.h ../matrixmath.h ../MemoryManager.h
- $(COMPILER) -c ../nltrans.c
-
-actn.o: ../actn.c ../spnbox.h ../../pnheaders/matrix.h ../../pnheaders/pns.h ../matrixmath.h ../MemoryManager.h
- $(COMPILER) -c ../actn.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
- cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
-
-../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
- cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Deleted: spnbox/tests/test-ilpadm.mak
===================================================================
--- spnbox/tests/test-ilpadm.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-ilpadm.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,43 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-ilpadm: test-ilpadm.o pns.o matrix.o general.o matrixmath.o MemoryManager.o ilpadm.o ipsolve.o ipslv.o StructuredIO.o test.o ../liblpsolve55.a
- $(COMPILER) -o test-ilpadm.exe pns.o matrix.o general.o matrixmath.o test-ilpadm.o ilpadm.o ipsolve.o MemoryManager.o StructuredIO.o test.o ipslv.o ../liblpsolve55.a
-
-general.o: ../../pnheaders/general.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/general.c
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-pns.o: ../../pnheaders/pns.c ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-ilpadm.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ilpadm.c
- $(COMPILER) -c ../ilpadm.c
-
-ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
- $(COMPILER) -c ../ipsolve.c
-
-ipslv.o: ../spnbox.h ../ipslv.c
- $(COMPILER) -c ../ipslv.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
- $(COMPILER) -c StructuredIO.c
-
-test-ilpadm.o: test-ilpadm.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-ilpadm.c
-
-../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
- cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
-
-../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
- cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Deleted: spnbox/tests/test-ipsolve.mak
===================================================================
--- spnbox/tests/test-ipsolve.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-ipsolve.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,40 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-ipsolve: test-ipsolve.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o StructuredIO.o test.o ../liblpsolve55.a
- $(COMPILER) -o test-ipsolve.exe pns.o matrix.o general.o matrixmath.o test-ipsolve.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o test.o ../liblpsolve55.a
-
-general.o: ../../pnheaders/general.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/general.c
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-pns.o: ../../pnheaders/pns.c ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
- $(COMPILER) -c ../ipsolve.c
-
-ipslv.o: ../spnbox.h ../ipslv.c
- $(COMPILER) -c ../ipslv.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-test-ipsolve.o: test-ipsolve.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-ipsolve.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
- $(COMPILER) -c StructuredIO.c
-
-../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
- cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
-
-../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
- cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Deleted: spnbox/tests/test-isadm.mak
===================================================================
--- spnbox/tests/test-isadm.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-isadm.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,31 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-isadm: test-isadm.o pns.o matrix.o general.o matrixmath.o MemoryManager.o isadm.o test.o StructuredIO.o
- $(COMPILER) -o test-isadm.exe pns.o matrix.o general.o matrixmath.o test-isadm.o MemoryManager.o test.o StructuredIO.o isadm.o ../liblpsolve55.a
-
-general.o: ../../pnheaders/general.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/general.c
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-pns.o: ../../pnheaders/pns.c ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-test-isadm.o: test-isadm.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-isadm.c
-
-isadm.o: ../isadm.c ../spnbox.h ../../pnheaders/general.h ../MemoryManager.h ../../pnheaders/pns.h ../matrixmath.h
- $(COMPILER) -c ../isadm.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
- $(COMPILER) -c StructuredIO.c
Deleted: spnbox/tests/test-linenf.mak
===================================================================
--- spnbox/tests/test-linenf.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-linenf.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,46 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-linenf: test-linenf.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o linenf.o test-linenf.o ilpadm.o test.o StructuredIO.o ../liblpsolve55.a
- $(COMPILER) -o test-linenf.exe pns.o matrix.o general.o matrixmath.o test-linenf.o ipsolve.o ipslv.o linenf.o ilpadm.o MemoryManager.o test.o StructuredIO.o ../liblpsolve55.a
-
-general.o: ../../pnheaders/general.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/general.c
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-pns.o: ../../pnheaders/pns.c ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
- $(COMPILER) -c ../ipsolve.c
-
-ipslv.o: ../spnbox.h ../ipslv.c
- $(COMPILER) -c ../ipslv.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-linenf.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../linenf.c
- $(COMPILER) -c ../linenf.c
-
-ilpadm.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ilpadm.c
- $(COMPILER) -c ../ilpadm.c
-
-test-linenf.o: test-linenf.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-linenf.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
- $(COMPILER) -c StructuredIO.c
-
-../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
- cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
-
-../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
- cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Deleted: spnbox/tests/test-msplit.mak
===================================================================
--- spnbox/tests/test-msplit.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-msplit.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,31 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-mpsplit: test-msplit.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o matrixmath.o msplit.o test.o
- $(COMPILER) -o test-msplit.exe test-msplit.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o msplit.o matrixmath.o test.o ../liblpsolve55.a
-
-general.o: ../../pnheaders/general.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/general.c
-
-pns.o: ../../pnheaders/pns.c ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
- $(COMPILER) -c StructuredIO.c
-
-test-msplit.o: test-msplit.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-msplit.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-msplit.o: ../spnbox.h ../../pnheaders/matrix.h ../matrixmath.h ../MemoryManager.h ../msplit.c
- $(COMPILER) -c ../msplit.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
Deleted: spnbox/tests/test-nltrans.mak
===================================================================
--- spnbox/tests/test-nltrans.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-nltrans.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,43 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-nltrans: test-nltrans.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o StructuredIO.o nltrans.o test.o ../liblpsolve55.a
- $(COMPILER) -o test-nltrans.exe pns.o matrix.o general.o matrixmath.o test-nltrans.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o nltrans.o test.o ../liblpsolve55.a
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-pns.o: ../../pnheaders/pns.h ../../pnheaders/pns.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-general.o: ../../pnheaders/general.h ../../pnheaders/general.c
- $(COMPILER) -c ../../pnheaders/general.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
- $(COMPILER) -c ../ipsolve.c
-
-ipslv.o: ../spnbox.h ../ipslv.c
- $(COMPILER) -c ../ipslv.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-test-nltrans.o: test-nltrans.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-nltrans.c
-
-StructuredIO.o: StructuredIO.c StructuredIO.h ../../pnheaders/matrix.h
- $(COMPILER) -c StructuredIO.c
-
-nltrans.o: ../nltrans.c ../spnbox.h ../../pnheaders/matrix.h ../matrixmath.h ../MemoryManager.h
- $(COMPILER) -c ../nltrans.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
- cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
-
-../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
- cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Deleted: spnbox/tests/test-pn2acpn.mak
===================================================================
--- spnbox/tests/test-pn2acpn.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-pn2acpn.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,32 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-pn2acpn: test-pn2acpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o matrixmath.o pn2acpn.o test.o
- $(COMPILER) -o test-pn2acpn.exe test-pn2acpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o pn2acpn.o test.o matrixmath.o ../liblpsolve55.a
-
-general.o: ../../pnheaders/general.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/general.c
-
-pns.o: ../../pnheaders/pns.c ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
- $(COMPILER) -c StructuredIO.c
-
-test-pn2acpn.o: test-pn2acpn.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-pn2acpn.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-pn2acpn.o: ../spnbox.h ../../pnheaders/matrix.h ../MemoryManager.h ../pn2acpn.c
- $(COMPILER) -c ../pn2acpn.c
-
\ No newline at end of file
Deleted: spnbox/tests/test-pn2eacpn.mak
===================================================================
--- spnbox/tests/test-pn2eacpn.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-pn2eacpn.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,47 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-pn2eacpn: test-pn2eacpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o matrixmath.o pn2eacpn.o nltrans.o ipsolve.o ipslv.o test.o ../liblpsolve55.a
- $(COMPILER) -o test-pn2eacpn.exe test-pn2eacpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o pn2eacpn.o matrixmath.o nltrans.o ipsolve.o ipslv.o test.o ../liblpsolve55.a
-
-general.o: ../../pnheaders/general.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/general.c
-
-pns.o: ../../pnheaders/pns.c ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
- $(COMPILER) -c StructuredIO.c
-
-test-pn2eacpn.o: test-pn2eacpn.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-pn2eacpn.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-pn2eacpn.o: ../spnbox.h ../../pnheaders/matrix.h ../MemoryManager.h ../pn2eacpn.c
- $(COMPILER) -c ../pn2eacpn.c
-
-ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
- $(COMPILER) -c ../ipsolve.c
-
-ipslv.o: ../spnbox.h ../ipslv.c
- $(COMPILER) -c ../ipslv.c
-
-nltrans.o: ../nltrans.c ../spnbox.h ../../pnheaders/matrix.h ../matrixmath.h ../MemoryManager.h
- $(COMPILER) -c ../nltrans.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
- cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
-
-../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
- cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
-
\ No newline at end of file
Deleted: spnbox/tests/test-reduce.mak
===================================================================
--- spnbox/tests/test-reduce.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-reduce.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,46 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-reduce: test-reduce.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o matrixmath.o chkcons.o reduce.o ipsolve.o ipslv.o test.o ../liblpsolve55.a
- $(COMPILER) -o test-reduce.exe test-reduce.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o reduce.o matrixmath.o chkcons.o ipsolve.o ipslv.o test.o ../liblpsolve55.a
-
-general.o: ../../pnheaders/general.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/general.c
-
-pns.o: ../../pnheaders/pns.c ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
- $(COMPILER) -c ../ipsolve.c
-
-ipslv.o: ../spnbox.h ../ipslv.c
- $(COMPILER) -c ../ipslv.c
-
-StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
- $(COMPILER) -c StructuredIO.c
-
-test-reduce.o: test-reduce.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-reduce.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-reduce.o: ../spnbox.h ../../pnheaders/matrix.h ../reduce.c
- $(COMPILER) -c ../reduce.c
-
-chkcons.o: ../spnbox.h ../../pnheaders/matrix.h ../../pnheaders/pns.h ../chkcons.c
- $(COMPILER) -c ../chkcons.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
- cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
-
-../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
- cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Deleted: spnbox/tests/test-supervis.mak
===================================================================
--- spnbox/tests/test-supervis.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-supervis.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,31 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-supervis: test-supervis.o pns.o matrix.o general.o matrixmath.o supervis.o test.o StructuredIO.o MemoryManager.o
- $(COMPILER) -o test-supervis.exe pns.o matrix.o general.o matrixmath.o test-supervis.o supervis.o test.o StructuredIO.o MemoryManager.o
-
-general.o: ../../pnheaders/general.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/general.c
-
-matrix.o: ../../pnheaders/ ../../pnheaders/matrix.c ../../pnheaders/ ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/ ../../pnheaders/matrix.c
-
-pns.o: ../../pnheaders/ ../../pnheaders/pns.c ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/ ../../pnheaders/matrix.h
- $(COMPILER) -c ../../pnheaders/ ../../pnheaders/pns.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/ ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-supervis.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/ ../../pnheaders/matrix.h ../supervis.c
- $(COMPILER) -c ../supervis.c
-
-test-supervis.o: test-supervis.c test.h ../MemoryManager.h ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c test-supervis.c
-
-test.o: test.c test.h ../MemoryManager.h ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c test.c
-
-StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
- $(COMPILER) -c StructuredIO.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
Deleted: spnbox/tests/test-tactn.mak
===================================================================
--- spnbox/tests/test-tactn.mak 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-tactn.mak 2009-07-07 05:53:03 UTC (rev 179)
@@ -1,43 +0,0 @@
-COMPILER=gcc -g -ggdb
-
-test-tactn: test-tactn.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o StructuredIO.o tactn.o test.o ../liblpsolve55.a
- $(COMPILER) -o test-tactn.exe pns.o matrix.o general.o matrixmath.o test-tactn.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o tactn.o test.o ../liblpsolve55.a
-
-matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
- $(COMPILER) -c ../../pnheaders/matrix.c
-
-pns.o: ../../pnheaders/pns.h ../../pnheaders/pns.c ../../pnheaders/general.h
- $(COMPILER) -c ../../pnheaders/pns.c
-
-general.o: ../../pnheaders/general.h ../../pnheaders/general.c
- $(COMPILER) -c ../../pnheaders/general.c
-
-matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../matrixmath.c
-
-ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
- $(COMPILER) -c ../ipsolve.c
-
-ipslv.o: ../spnbox.h ../ipslv.c
- $(COMPILER) -c ../ipslv.c
-
-MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
- $(COMPILER) -c ../MemoryManager.c
-
-test-tactn.o: test-tactn.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test-tactn.c
-
-StructuredIO.o: StructuredIO.c StructuredIO.h ../../pnheaders/matrix.h
- $(COMPILER) -c StructuredIO.c
-
-tactn.o: ../tactn.c ../spnbox.h ../../pnheaders/matrix.h ../../pnheaders/pns.h ../matrixmath.h ../MemoryManager.h
- $(COMPILER) -c ../tactn.c
-
-test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
- $(COMPILER) -c test.c
-
-../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
- cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
-
-../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
- cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Modified: spnbox/tests/test-tactn.txt
===================================================================
--- spnbox/tests/test-tactn.txt 2009-07-07 04:04:54 UTC (rev 178)
+++ spnbox/tests/test-tactn.txt 2009-07-07 05:53:03 UTC (rev 179)
@@ -5,71 +5,60 @@
rem arrayi IncludeT - Indices of transitions which must be included in the active subnet.
echo Problem 1
-echo Using just an incidence matrix.
-echo The active subnet should include transitions 4, 5, and 6.
-echo Unique should be 0.
+echo This problem supplies a 3rd order identity as the Petri net incidence
+echo matrix, which should yield an unmodified net as the active subnet. No
+echo other parameters are used.
-D 6 8
--1 -2 0 0 0 0 0 0
-0 -1 -2 0 0 0 0 0
-0 0 -1 -2 0 0 0 0
-1 1 0 0 6 -2 0 -1
-0 0 1 1 0 -3 6 0
-0 0 0 0 -2 2 -2 0
+D 3 3
+1 0 0
+0 1 0
+0 0 1
done
echo Problem 2
-echo Using the same Petri net as before but forcing transition 5 to be
-echo unraisable. The active subnet should now be empty.
-echo Unique should be 1.
+echo This problem adds an excluded transition.
+echo The correct answer should have Da:
+echo -1 1 0 0
+echo 1 -1 0 0
+echo 0 0 0 0
+echo 0 0 0 0
+echo And Dra:
+echo -1 1
+echo 1 -1
-D 6 8
--1 -2 0 0 0 0 0 0
-0 -1 -2 0 0 0 0 0
-0 0 -1 -2 0 0 0 0
-1 1 0 0 6 -2 0 -1
-0 0 1 1 0 -3 6 0
-0 0 0 0 -2 2 -2 0
+D 4 4
+-1 1 0 0
+1 -1 0 0
+0 0 -1 1
+0 0 1 -1
ExcludeT 1
-5
+2
done
echo Problem 3
-echo This problem uses the PT-ordinary version of the petri net from problems
-echo 1 and 2 with an extra row added. That is, a row has been added, the net has
-echo been fed to msplit, and the result used here. It also uses as the
-echo precalculated active subnet matrix returned in Problem 1.
+echo This problem adds an included transition.
+echo Correct answer should have Dra
+echo -1 1
+echo 1 -1
+echo And Da with Dra in the upper left corner.
-D 14 15
--1 -1 0 0 0 0 0 0 -1 0 0 0 0 0 0
-0 -1 -1 0 0 0 0 0 0 -1 0 0 0 0 0
-0 0 -1 -1 0 0 0 0 0 0 -1 0 0 0 0
-1 1 0 0 6 -1 0 -1 0 0 0 0 -1 0 0
-0 0 1 1 0 -1 6 0 0 0 0 0 -1 -1 0
-0 0 0 0 -1 2 -1 0 0 0 0 -1 0 0 -1
-0 0 0 0 1 -1 1 0 0 0 0 0 -1 0 0
-0 -1 0 0 0 0 0 0 1 0 0 0 0 0 0
-0 0 -1 0 0 0 0 0 0 1 0 0 0 0 0
-0 0 0 -1 0 0 0 0 0 0 1 0 0 0 0
-0 0 0 0 -1 0 0 0 0 0 0 1 0 0 0
-0 0 0 0 0 -1 0 0 0 0 0 0 1 0 0
-0 0 0 0 0 0 0 0 0 0 0 0 -1 1 0
-0 0 0 0 0 0 -1 0 0 0 0 0 0 0 1
+D 6 6
+-1 1 0 0 0 0
+1 -1 0 0 0 0
+0 0 -1 1 0 0
+0 0 1 -1 0 0
+0 0 0 0 -1 1
+0 0 0 0 1 -1
-Dc 6 8
-0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0
-0 0 0 0 6 -2 0 -1
-0 0 0 0 0 -3 6 0
-0 0 0 0 -2 2 -2 0
+IncludeT 1
+1
done
-echo The solution should have nonzero arcs in rows: 4, 5, 6, 7, 11, 12, 13, 14
-echo The solution should have nonzero arcs in cols: 5, 6, 7, 8, 12, 13, 14, 15
-
-quit
\ No newline at end of file
+echo Problems 4 & 5
+echo These problems test update mode. The solutions to the problems should be
+echo the same.
+quit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
