diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed unused variables and incorrect prototypes

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1983 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
rzf 2007-11-08 11:32:14 +00:00
parent 1268730712
commit c630e32855
4 changed files with 13 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cplint/Makefile
View File

@ -1,27 +0,0 @@
OBJECTS=cplint_yap.o cplint_Prob.o
.PHONY : clean
# -lutil -lst -lepd libutil.a /usr/local/bin/yap.dll \
cplint: $(OBJECTS)
gcc -mno-cygwin -shared -o cplint.dll $(OBJECTS) "C:\Software\BDD\cudd-2.4.1 mingw\cudd-2.4.1\cudd\libcudd.a" \
"C:\Software\BDD\cudd-2.4.1 mingw\cudd-2.4.1\mtr\libmtr.a" "C:\Software\BDD\cudd-2.4.1 mingw\cudd-2.4.1\st\libst.a" \
"C:\Software\BDD\cudd-2.4.1 mingw\cudd-2.4.1\util\libutil.a" "C:\Software\BDD\cudd-2.4.1 mingw\cudd-2.4.1\epd\libepd.a" \
"C:\Software\BDD\glu-2.1\libglu.a" "C:\Yap\bin\yap.dll" \
"C:\zipped\Glib windows\glib-2.12.11\bin\libglib-2.0-0.dll"
cplint_yap.o: cplint_yap.c cplint.h
gcc -mno-cygwin -I/usr/local \
-I/usr/include/glib-1.2 -I/lib/glib/include -I"c:/Yap/include" \
-I"C:\Software\BDD\Somenzi\glu-2.1\include" \
-I"C:\Software\BDD\cudd-2.4.1\cudd-2.4.1\include" \
-c -shared cplint_yap.c
cplint_Prob.o: cplint_Prob.c cplint.h
gcc -mno-cygwin -I/usr/local \
-I/usr/include/glib-1.2 -I/lib/glib/include -I"c:/Yap/include" \
-I/cygdrive/c/Software/BDD/Somenzi/glu-2.1/include \
-I"C:\Software\BDD\cudd-2.4.1\cudd-2.4.1\include" \
-c -shared cplint_Prob.c
clean:
rm $(OBJECTS) cpint.so

37
cplint/cplint.h
View File

@ -3,38 +3,8 @@
Copyright (c) 2007, Fabrizio Riguzzi
For the use of cudd:
Copyright (c) 1995-2004, Regents of the University of Colorado
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
Neither the name of the University of Colorado nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
This package uses the library cudd, see http://vlsi.colorado.edu/~fabio/CUDD/
for the relative license.
*/
@ -61,8 +31,7 @@ typedef struct
void createVars(array_t * vars, YAP_Term t,DdManager * mgr, array_t * bVar2mVar, char inames[1000][20]);
void createExpression(array_t * expression, YAP_Term t);
static int compute_prob(void);
void init_my_predicates();
void init_my_predicates(void);
int compare(char *a, char *b);
gint my_equal(gconstpointer v,gconstpointer v2);
guint my_hash(gconstpointer key);

38
cplint/cplint_Prob.c
View File

@ -3,38 +3,9 @@
Copyright (c) 2007, Fabrizio Riguzzi
For the use of cudd:
Copyright (c) 1995-2004, Regents of the University of Colorado
This package uses the library cudd, see http://vlsi.colorado.edu/~fabio/CUDD/
for the relative license.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
Neither the name of the University of Colorado nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
This file contains the definition of Prob and ProbBool plus the functions
for building the BDD
@ -44,6 +15,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "cplint.h"
#include <stdlib.h>
int correctPosition(int index,variable v, DdNode * node,int posBVar);
@ -145,10 +117,9 @@ nodes is used to store nodes for which the probability has alread been computed
so that it is not recomputed
*/
{
DdNode *T,*F;
int index,mVarIndex,nBit;
variable v;
double p,res;
double res;
double value;
double * value_p;
DdNode **key;
@ -191,7 +162,6 @@ array_t * vars,array_t * bVar2mVar, GHashTable * nodes)
DdNode *T,*F;
double p,res;
array_t * probs;
double value;
probs=v.probabilities;
if (nBit==0)

44
cplint/cplint_yap.c
View File

@ -3,38 +3,9 @@
Copyright (c) 2007, Fabrizio Riguzzi
For the use of cudd:
Copyright (c) 1995-2004, Regents of the University of Colorado
This package uses the library cudd, see http://vlsi.colorado.edu/~fabio/CUDD/
for the relative license.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
Neither the name of the University of Colorado nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
This file contains the functions for interfacing Yap and C
The arguments of the predicate compute_prob are parsed and translated into C data
@ -51,6 +22,7 @@ unsigned long dividend;
FILE *open_file (char *filename, const char *mode);
void reverse(char s[]);
static int compute_prob(void);
void createVars(array_t * vars, YAP_Term t,DdManager * mgr, array_t * bVar2mVar, char inames[1000][20])
/* adds the boolean variables to the BDD and returns
@ -106,7 +78,7 @@ each factor is a couple (index of variable, index of value) obtained from a prol
two integers
*/
{
YAP_Term termTerm,factorTerm,tail;
YAP_Term termTerm,factorTerm;
factor f;
int i,j;
array_t * term;
@ -137,13 +109,10 @@ static int compute_prob(void)
*/
{
YAP_Term out,arg1,arg2,arg3,arg4;
array_t * variables,* expression, * term, * bVar2mVar;
array_t * variables,* expression, * bVar2mVar;
DdNode * function, * add;
DdManager * mgr;
factor f;
variable v;
double p;
int var,val,nBVar,i,j,intBits;
int nBVar,i,j,intBits;
FILE * file;
DdNode * array[1];
char * onames[1];
@ -151,7 +120,6 @@ static int compute_prob(void)
char * names[1000];
GHashTable * nodes; /* hash table that associates nodes with their probability if already
computed, it is defined in glib */
Cudd_ReorderingType * method;
arg1=YAP_ARG1;
arg2=YAP_ARG2;