diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 20:14:12 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 20:14:12 -0700 |
commit | 1c33107cbb50705272682c2637d8faaeab4be61a (patch) | |
tree | 188bb58cb82f744407af2ee78b38a7aa37fd9336 /src/proof | |
parent | b0ef0aaf0055d35f3836be18997dfd350e36054d (diff) | |
download | abc-1c33107cbb50705272682c2637d8faaeab4be61a.tar.gz abc-1c33107cbb50705272682c2637d8faaeab4be61a.tar.bz2 abc-1c33107cbb50705272682c2637d8faaeab4be61a.zip |
Updating project settings to have simpler include paths.
Diffstat (limited to 'src/proof')
40 files changed, 86 insertions, 86 deletions
diff --git a/src/proof/bbr/bbr.h b/src/proof/bbr/bbr.h index 71061759..1db638e8 100644 --- a/src/proof/bbr/bbr.h +++ b/src/proof/bbr/bbr.h @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////////////////// #include <stdio.h> -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" -#include "src/bdd/cudd/cuddInt.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" +#include "bdd/cudd/cuddInt.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/proof/bbr/bbrImage.c b/src/proof/bbr/bbrImage.c index 23b43169..1ff3d0b6 100644 --- a/src/proof/bbr/bbrImage.c +++ b/src/proof/bbr/bbrImage.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "bbr.h" -#include "src/bdd/mtr/mtr.h" +#include "bdd/mtr/mtr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/cec/cecCec.c b/src/proof/cec/cecCec.c index 841b6a0b..30c930a0 100644 --- a/src/proof/cec/cecCec.c +++ b/src/proof/cec/cecCec.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "cecInt.h" -#include "src/proof/fra/fra.h" -#include "src/aig/gia/giaAig.h" +#include "proof/fra/fra.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/cec/cecChoice.c b/src/proof/cec/cecChoice.c index 05b372f8..b18a545f 100644 --- a/src/proof/cec/cecChoice.c +++ b/src/proof/cec/cecChoice.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "cecInt.h" -#include "src/aig/gia/giaAig.h" -#include "src/proof/dch/dch.h" +#include "aig/gia/giaAig.h" +#include "proof/dch/dch.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/cec/cecInt.h b/src/proof/cec/cecInt.h index 8d9fe472..36ff3483 100644 --- a/src/proof/cec/cecInt.h +++ b/src/proof/cec/cecInt.h @@ -26,9 +26,9 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/sat/bsat/satSolver.h" -#include "src/misc/bar/bar.h" -#include "src/aig/gia/gia.h" +#include "sat/bsat/satSolver.h" +#include "misc/bar/bar.h" +#include "aig/gia/gia.h" #include "cec.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/proof/cec/cecSynth.c b/src/proof/cec/cecSynth.c index b13b5204..6fc991a8 100644 --- a/src/proof/cec/cecSynth.c +++ b/src/proof/cec/cecSynth.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "cecInt.h" -#include "src/aig/gia/giaAig.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/dch/dchInt.h b/src/proof/dch/dchInt.h index b22834cf..05f4271d 100644 --- a/src/proof/dch/dchInt.h +++ b/src/proof/dch/dchInt.h @@ -26,8 +26,8 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/aig/aig.h" -#include "src/sat/bsat/satSolver.h" +#include "aig/aig/aig.h" +#include "sat/bsat/satSolver.h" #include "dch.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/proof/dch/dchSweep.c b/src/proof/dch/dchSweep.c index dafab06e..f807b638 100644 --- a/src/proof/dch/dchSweep.c +++ b/src/proof/dch/dchSweep.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "dchInt.h" -#include "src/misc/bar/bar.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fra.h b/src/proof/fra/fra.h index c1dd6b44..922a3c47 100644 --- a/src/proof/fra/fra.h +++ b/src/proof/fra/fra.h @@ -31,11 +31,11 @@ #include <string.h> #include <assert.h> -#include "src/misc/vec/vec.h" -#include "src/aig/aig/aig.h" -#include "src/opt/dar/dar.h" -#include "src/sat/bsat/satSolver.h" -#include "src/aig/ioa/ioa.h" +#include "misc/vec/vec.h" +#include "aig/aig/aig.h" +#include "opt/dar/dar.h" +#include "sat/bsat/satSolver.h" +#include "aig/ioa/ioa.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/proof/fra/fraCec.c b/src/proof/fra/fraCec.c index 20805ec2..f1f15155 100644 --- a/src/proof/fra/fraCec.c +++ b/src/proof/fra/fraCec.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver2.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver2.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraClau.c b/src/proof/fra/fraClau.c index 6c692afa..a2db1e65 100644 --- a/src/proof/fra/fraClau.c +++ b/src/proof/fra/fraClau.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraClaus.c b/src/proof/fra/fraClaus.c index 97ac3e40..95ab0c99 100644 --- a/src/proof/fra/fraClaus.c +++ b/src/proof/fra/fraClaus.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraInd.c b/src/proof/fra/fraInd.c index 0c7134aa..e0a54a4e 100644 --- a/src/proof/fra/fraInd.c +++ b/src/proof/fra/fraInd.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" -#include "src/opt/dar/dar.h" -#include "src/aig/saig/saig.h" +#include "sat/cnf/cnf.h" +#include "opt/dar/dar.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraIndVer.c b/src/proof/fra/fraIndVer.c index 099256ac..26b64647 100644 --- a/src/proof/fra/fraIndVer.c +++ b/src/proof/fra/fraIndVer.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "fra.h" -#include "src/sat/cnf/cnf.h" +#include "sat/cnf/cnf.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraSec.c b/src/proof/fra/fraSec.c index ac6cd67e..c43fc4dd 100644 --- a/src/proof/fra/fraSec.c +++ b/src/proof/fra/fraSec.c @@ -19,12 +19,12 @@ ***********************************************************************/ #include "fra.h" -#include "src/aig/ioa/ioa.h" -#include "src/proof/int/int.h" -#include "src/proof/ssw/ssw.h" -#include "src/aig/saig/saig.h" -#include "src/proof/bbr/bbr.h" -#include "src/proof/pdr/pdr.h" +#include "aig/ioa/ioa.h" +#include "proof/int/int.h" +#include "proof/ssw/ssw.h" +#include "aig/saig/saig.h" +#include "proof/bbr/bbr.h" +#include "proof/pdr/pdr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fra/fraSim.c b/src/proof/fra/fraSim.c index 555789e2..76e0a132 100644 --- a/src/proof/fra/fraSim.c +++ b/src/proof/fra/fraSim.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "fra.h" -#include "src/aig/saig/saig.h" +#include "aig/saig/saig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/fraig/fraigInt.h b/src/proof/fraig/fraigInt.h index 1ff8727e..bcd745d1 100644 --- a/src/proof/fraig/fraigInt.h +++ b/src/proof/fraig/fraigInt.h @@ -29,9 +29,9 @@ #include <string.h> #include <assert.h> -#include "src/misc/util/abc_global.h" +#include "misc/util/abc_global.h" #include "fraig.h" -#include "src/sat/msat/msat.h" +#include "sat/msat/msat.h" ABC_NAMESPACE_HEADER_START diff --git a/src/proof/fraig/fraigSat.c b/src/proof/fraig/fraigSat.c index 7a11c072..fb3f1fec 100644 --- a/src/proof/fraig/fraigSat.c +++ b/src/proof/fraig/fraigSat.c @@ -18,7 +18,7 @@ #include <math.h> #include "fraigInt.h" -#include "src/sat/msat/msatInt.h" +#include "sat/msat/msatInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/int/intContain.c b/src/proof/int/intContain.c index a031c7a4..8ed6624d 100644 --- a/src/proof/int/intContain.c +++ b/src/proof/int/intContain.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "intInt.h" -#include "src/proof/fra/fra.h" +#include "proof/fra/fra.h" ABC_NAMESPACE_IMPL_START @@ -245,7 +245,7 @@ int Inter_ManCheckInductiveContainment( Aig_Man_t * pTrans, Aig_Man_t * pInter, } ABC_NAMESPACE_IMPL_END -#include "src/proof/fra/fra.h" +#include "proof/fra/fra.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/int/intCtrex.c b/src/proof/int/intCtrex.c index 840ae75d..9b2946e9 100644 --- a/src/proof/int/intCtrex.c +++ b/src/proof/int/intCtrex.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "intInt.h" -#include "src/proof/ssw/ssw.h" +#include "proof/ssw/ssw.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/int/intInt.h b/src/proof/int/intInt.h index ec2a0356..b7f7a2a7 100644 --- a/src/proof/int/intInt.h +++ b/src/proof/int/intInt.h @@ -26,10 +26,10 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/saig/saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" -#include "src/sat/bsat/satStore.h" +#include "aig/saig/saig.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" +#include "sat/bsat/satStore.h" #include "int.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/proof/int/intM114p.c b/src/proof/int/intM114p.c index ad1ff61d..4f27ee82 100644 --- a/src/proof/int/intM114p.c +++ b/src/proof/int/intM114p.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "intInt.h" -#include "src/sat/psat/m114p.h" +#include "sat/psat/m114p.h" #ifdef ABC_USE_LIBRARIES diff --git a/src/proof/int/intMan.c b/src/proof/int/intMan.c index 6fd81d7a..e419da86 100644 --- a/src/proof/int/intMan.c +++ b/src/proof/int/intMan.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "intInt.h" -#include "src/aig/ioa/ioa.h" +#include "aig/ioa/ioa.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/live/liveness.c b/src/proof/live/liveness.c index 654e1d68..1c4d31df 100644 --- a/src/proof/live/liveness.c +++ b/src/proof/live/liveness.c @@ -19,11 +19,11 @@ ***********************************************************************/ #include <stdio.h> -#include "src/base/main/main.h" -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" +#include "base/main/main.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" #include <string.h> -#include "src/base/main/mainInt.h" +#include "base/main/mainInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/live/liveness_sim.c b/src/proof/live/liveness_sim.c index f1ad794a..3a05ebf7 100644 --- a/src/proof/live/liveness_sim.c +++ b/src/proof/live/liveness_sim.c @@ -19,9 +19,9 @@ ***********************************************************************/ #include <stdio.h> -#include "src/base/main/main.h" -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" +#include "base/main/main.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" #include <string.h> ABC_NAMESPACE_IMPL_START diff --git a/src/proof/live/ltl_parser.c b/src/proof/live/ltl_parser.c index de567576..36d109cc 100644 --- a/src/proof/live/ltl_parser.c +++ b/src/proof/live/ltl_parser.c @@ -22,9 +22,9 @@ #include <string.h> #include <assert.h> #include <stdlib.h> -#include "src/aig/aig/aig.h" -#include "src/base/abc/abc.h" -#include "src/base/main/mainInt.h" +#include "aig/aig/aig.h" +#include "base/abc/abc.h" +#include "base/main/mainInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/llb/llb1Core.c b/src/proof/llb/llb1Core.c index b16fdee7..3aa7a6e5 100644 --- a/src/proof/llb/llb1Core.c +++ b/src/proof/llb/llb1Core.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "llbInt.h" -#include "src/aig/gia/gia.h" -#include "src/aig/gia/giaAig.h" +#include "aig/gia/gia.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/llb/llb4Cex.c b/src/proof/llb/llb4Cex.c index b5bdb36e..c676b76e 100644 --- a/src/proof/llb/llb4Cex.c +++ b/src/proof/llb/llb4Cex.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "llbInt.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/llb/llb4Map.c b/src/proof/llb/llb4Map.c index b1442699..51f1fec6 100644 --- a/src/proof/llb/llb4Map.c +++ b/src/proof/llb/llb4Map.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "llbInt.h" -#include "src/base/abc/abc.h" -#include "src/map/if/if.h" +#include "base/abc/abc.h" +#include "map/if/if.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/llb/llbInt.h b/src/proof/llb/llbInt.h index 58e2b543..208d291c 100644 --- a/src/proof/llb/llbInt.h +++ b/src/proof/llb/llbInt.h @@ -27,10 +27,10 @@ //////////////////////////////////////////////////////////////////////// #include <stdio.h> -#include "src/aig/aig/aig.h" -#include "src/aig/saig/saig.h" -#include "src/proof/ssw/ssw.h" -#include "src/misc/extra/extraBdd.h" +#include "aig/aig/aig.h" +#include "aig/saig/saig.h" +#include "proof/ssw/ssw.h" +#include "misc/extra/extraBdd.h" #include "llb.h" //////////////////////////////////////////////////////////////////////// diff --git a/src/proof/pdr/pdrInt.h b/src/proof/pdr/pdrInt.h index a1432e6c..f24cb81d 100644 --- a/src/proof/pdr/pdrInt.h +++ b/src/proof/pdr/pdrInt.h @@ -25,9 +25,9 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/saig/saig.h" -#include "src/sat/cnf/cnf.h" -#include "src/sat/bsat/satSolver.h" +#include "aig/saig/saig.h" +#include "sat/cnf/cnf.h" +#include "sat/bsat/satSolver.h" #include "pdr.h" ABC_NAMESPACE_HEADER_START diff --git a/src/proof/pdr/pdrInv.c b/src/proof/pdr/pdrInv.c index f9b4a55d..4b096e1b 100644 --- a/src/proof/pdr/pdrInv.c +++ b/src/proof/pdr/pdrInv.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "pdrInt.h" -#include "src/base/abc/abc.h" // for Abc_NtkCollectCioNames() -#include "src/base/main/main.h" // for Abc_FrameReadGlobalFrame() +#include "base/abc/abc.h" // for Abc_NtkCollectCioNames() +#include "base/main/main.h" // for Abc_FrameReadGlobalFrame() ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswConstr.c b/src/proof/ssw/sswConstr.c index 5459aa72..2612191d 100644 --- a/src/proof/ssw/sswConstr.c +++ b/src/proof/ssw/sswConstr.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/sat/cnf/cnf.h" -#include "src/misc/bar/bar.h" +#include "sat/cnf/cnf.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswDyn.c b/src/proof/ssw/sswDyn.c index 760f457a..96f1315b 100644 --- a/src/proof/ssw/sswDyn.c +++ b/src/proof/ssw/sswDyn.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/misc/bar/bar.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswFilter.c b/src/proof/ssw/sswFilter.c index 3fff79bb..047e2201 100644 --- a/src/proof/ssw/sswFilter.c +++ b/src/proof/ssw/sswFilter.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/aig/gia/giaAig.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswInt.h b/src/proof/ssw/sswInt.h index 8749cec1..1edf2087 100644 --- a/src/proof/ssw/sswInt.h +++ b/src/proof/ssw/sswInt.h @@ -26,10 +26,10 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "src/aig/saig/saig.h" -#include "src/sat/bsat/satSolver.h" +#include "aig/saig/saig.h" +#include "sat/bsat/satSolver.h" #include "ssw.h" -#include "src/aig/ioa/ioa.h" +#include "aig/ioa/ioa.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/proof/ssw/sswPart.c b/src/proof/ssw/sswPart.c index 22340779..78ddbc5c 100644 --- a/src/proof/ssw/sswPart.c +++ b/src/proof/ssw/sswPart.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/aig/ioa/ioa.h" +#include "aig/ioa/ioa.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswRarity.c b/src/proof/ssw/sswRarity.c index 7048927f..01715e7d 100644 --- a/src/proof/ssw/sswRarity.c +++ b/src/proof/ssw/sswRarity.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/aig/gia/giaAig.h" -#include "src/base/main/main.h" +#include "aig/gia/giaAig.h" +#include "base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswRarity2.c b/src/proof/ssw/sswRarity2.c index 1d93de60..6a67dea6 100644 --- a/src/proof/ssw/sswRarity2.c +++ b/src/proof/ssw/sswRarity2.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/aig/gia/giaAig.h" +#include "aig/gia/giaAig.h" ABC_NAMESPACE_IMPL_START diff --git a/src/proof/ssw/sswSweep.c b/src/proof/ssw/sswSweep.c index ab6952a2..b4ff44c2 100644 --- a/src/proof/ssw/sswSweep.c +++ b/src/proof/ssw/sswSweep.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "sswInt.h" -#include "src/misc/bar/bar.h" +#include "misc/bar/bar.h" ABC_NAMESPACE_IMPL_START |