From 746d40d815966dee9ec7b6b5d7fec7bbcae4a8dd Mon Sep 17 00:00:00 2001
From: Luca Liechti <luca.liechti@gmail.com>
Date: Fri, 3 Feb 2017 11:09:43 +0100
Subject: [PATCH] some refactorings for convenience

---
 bin/datastructures/FormalContext.class | Bin 6769 -> 6870 bytes
 bin/driver/Driver.class                | Bin 6690 -> 6093 bytes
 bin/parsers/BibTexParser.class         | Bin 4353 -> 4727 bytes
 bin/parsers/JSONParser.class           | Bin 3620 -> 3950 bytes
 bin/parsers/NoSQLParser.class          | Bin 381 -> 383 bytes
 bin/parsers/XMLParser.class            | Bin 4467 -> 4861 bytes
 src/datastructures/FormalContext.java  |   6 ++-
 src/datastructures/Lattice.java        |  32 +++++++++--
 src/datastructures/LatticeNode.java    |   2 +-
 src/driver/Driver.java                 |  71 ++++++++++++-------------
 src/driver/LatticeBuilder.java         |   7 ++-
 src/parsers/BibTexParser.java          |   9 ++--
 src/parsers/JSONParser.java            |  10 ++--
 src/parsers/NoSQLParser.java           |   2 +-
 src/parsers/XMLParser.java             |  13 +++--
 15 files changed, 94 insertions(+), 58 deletions(-)

diff --git a/bin/datastructures/FormalContext.class b/bin/datastructures/FormalContext.class
index 4ab36b0db89c9a3e3515b62165ffae800da55fee..1824ac452519408e70ef103107269260afef901e 100644
GIT binary patch
delta 2687
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
St>C?Gb>pl`w|+7mQu99-TTpEP

delta 2577
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

diff --git a/bin/driver/Driver.class b/bin/driver/Driver.class
index 500267a97b62b077914cd7f95b4162f2ee8b2c73..fbecbcfc7a891b6243cb0afc71e16102455bf5fa 100644
GIT binary patch
literal 6093
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
DQK3lg

literal 6690
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
B^49<W

diff --git a/bin/parsers/BibTexParser.class b/bin/parsers/BibTexParser.class
index cc201a9b862d56234bec9f83969cf6fd7aee34dc..844394ccf2aebfab19f488f676c82a214f55d425 100644
GIT binary patch
literal 4727
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

literal 4353
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

diff --git a/bin/parsers/JSONParser.class b/bin/parsers/JSONParser.class
index cd93a7dd645ca4c3596af54d467051b37db829d2..c7cd900c865a54ee42cfabc9820538455e464594 100644
GIT binary patch
literal 3950
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

literal 3620
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

diff --git a/bin/parsers/NoSQLParser.class b/bin/parsers/NoSQLParser.class
index 9b25ee1363641c9f4f831c42e46ef7bee056af38..9e1a7edfeb330f70a32e8628c5a6d33b093ac86a 100644
GIT binary patch
delta 56
tcmey%^q*;hyQr3iPgY`CqJB<dUb=p8Nl|8Ay0z!TXcbXUtP+!70RTL46tw^V

delta 22
bcmey*^p|OZJEP{rM&XGuDvTZ=dg?0xVb%z?

diff --git a/bin/parsers/XMLParser.class b/bin/parsers/XMLParser.class
index fb8c373fd32c9ecbe19894bed63b5e507331621c..d07b033f62462c2994e708edaa27c80466737e33 100644
GIT binary patch
literal 4861
zcmb7Id3Y4{8Ga|(-Pvp=Kn{-8fI&b=LJ~?T;wA_o2{tqbn#d&uCc8tju-OT-vl=K?
z+uGBX+QYWc7K_@Z*bAd<#I)M`pa-@0ecAi|yHB6e_nVo$ASmW}c6R1B-}U?6_xpa|
z=KTMjeg?oA{98qdg32-7N*PwFWk+w%R_9iQPr;l6`ki`9LQf92^bZ{{qPB{Fg6gbr
zpE+==C$6C4E<I@*F;_07psFXYJYZY#<Zvs6lKQC8Zu4;{Z5uSTR8P^b9XFGy&Ui{6
zN*FN($}R=LwrC=rjN3OWC|yy%O@Xh&j2R)!L6wS11+(+kI}$Xap&B&`=EaOu+%jVA
zS+fJSZl@UzjqEA|1vG?EPW_&E(&$T%4jI;<xRrp-sGiuSTXA{z7AvS9J=m*{dC!41
zC#VogQLEt^R0OezvBi`7O|f35K}9f#>$zqh9y4TZsfIEHWnm=FK&pGP>C5Gsi79gy
zH^(KAh835muDjk{OWW~8OS@(1hkN2FTNDT4!%1$@qGI<|E4KB-bX!l^Ryr!Gsg}*A
zHL53E@LF$f4KePO8k(?znKH(0OOM)J31ieq+9`S0qG1(Y#?3@6L${4WZEkU;7sn;R
zUTF)y{m!<_d)s&H?ccPet7CA09Ozas%cWG-v4Xi*NW#2g=$Lp9u7;Tu+ImcDxaC01
z99`Yw+2)oNY<LOjo5_L-8mV@8S-kTQBB)hCDlf|GanrV8Wdk7cd<tQ`2(~NG95ZpV
zMJN%%Msx_<I+=nQf~?=BVzYv4^2X!Iv9#SX(7t0+I-ZD$;V#t5rCY-myh?$8NM4Yf
zo;lA`Ykfg(I?ZTW5GNaY(XXP9HIjFceXC(BZY5U3hJBl9W?3SE7TU_@IfMb+u40fa
zCvVDosbL$oyOuhQRMbeu*ilHQwiN|Id1-U=RTQq1^KNEQw@u6WW*N7ZV<+xV!H!au
zM<y$!VK-jQ%1n~t3ThZ}zN>h(AOY{yun)Qdm3!=C1G`kzYi}V$VW?nM3;L$}PQ!i-
zD+m~e(t3hhDniloRKH7j64!7*L`(HpOkz)H7?sARj_9dAh8cp1Ln_7;%+DuqOJ{#?
z*Lc(zlSZn+LIulqj6K(O+See<mn5=9F`cC-5%2ELDT(X5G>qdg(~*iF;U3vByH&hK
z!Ge5Ja&5KCvP`n-2x=9S82j1zF2~4&)q{$gPCD(jf4_6W<WGt+hpiN&(^)P8Svo2R
zrSx%+#0qK)oLowA)?P5?F_r)oNM@NziE^uuqSXaLS%NY>dLrRHrLsg3gO}5X24_Xn
zmc<(J6xg@8iEx44B50`KwXovsbG@)RX1!jiQSF<tzs@XOXg7Cmyjc4$!@KYv74I%)
z^5K+ijB0o<9wa%;G%F^*nXN9_cp8kh2JwD&Isuu7ex2zI4yiiZtc#kQ5XSB1=H|K(
zj^l$WP86`Qz=VbmNw4!e6c%cp)bJ2KLWJX9ee)pCR%=n+x2kwp!L=`Nx`l8`THydb
zs^MdpASYPW9V6_9#F1U1$gFe7mg6)|s(6fO=Q$v6q~JfP;ZxEZe4J@UCDhMoI3ood
zl-=s_B+tuJnAGqDp5*+KGVI*=!#=QJMkHJ7w@H8*4O4iES<VJH$mI1o2enh6H_UVt
z6m+m$TRMfOHB3uJRr;3>7R2Y6-k6y*ngxkxHGJNA?Ib+GGz1Orv}erDXp%425+lJ*
z=EACA;R{X@tY1Al?Qy%ai>rkza|+7Jn`qRifYC)KWjS31YYGIfn#aXuRiKvdXkL=!
z{9jh!LSmV@pa>fA7}PC6#U-?~E*Wf9e3xzcQrlkl3gUZY$@pkuZwMFA5yTJKEOrZp
zeyrgq_$i6VIo9q@#*FcPHq@dc!i%!LTjYPP;TO`U1N1s<kI2%mH2fOBVa8JFp_DUh
zOM!G}r$%Rj&(Yxmey8Di{GJx{u`wRA3YxBpO5RRb;D6*+nxk?WUBI6;{6#7tXq&DJ
zb_X`%!aVg5$avJq<|&AOh<?mu3keOFY0G`Z`pS*O&5}hd=BQc9kDu2PnXLJfr9`G_
zV9o-W<M}MB8Y(C?i%)I*mcPm>C4<=~p!z1@D}4fUALn8z=JOhGL@Kd>_a*#<`SGJf
z+ekcQqUTjC-NKh*tFmDV*EUowJd5iZsurKc60ua`SgL|g1bD4xFg5&b;#$>QMJ&S&
ze6L_RR#2nf(Q9ywA7m_|ThY*1JB7x+hNdYrpW%WVV#o<>KKHi33A4c!_6$-DtGR25
zt^zOTk2uLq0I$GW>fgv!3BX-h$CVP9<8uMrBmtBx=ekD8$!SD(PNA)D8teJJA>u1t
z>z~HPosCo26bVeDi>tRp)UX;3Wbn#JFdWRFCsGzJ3;Qy-EfSi*>Tu{Bb|~y11CjD@
zc?NqLp2T$-3?0Y(+T$pzo$G%X6;1MHWcz)7MZ^y(IC1g(1ZpAyv74Mg$h}KVV(tkn
z6ur6r+DA~{l);^~kD`1UM;OV`XPeG&Cp9>VdpHQm_ggvF_#8O;2m?^d%q%1ji}<#V
z*Tqc#_58K6gqc~&L3$ZF2unX#N0=3puvlC>ij}n3L~G4>04;3ctDMXqbKsiHWqvZ3
z`AIMHK|JPVzLJgpZoHP!)Ziqots$)zVGr)b>xj;B+>Y1d4a8*?dT<}!$T)B0ME)kc
znT*~@=DvmALyT+*-o~|ZYWZ<L-cH^7ox6ANPSBml47gqeU03rMHHFCiD7(lFma9-y
zMEQxRSkJGGD!Nqksu)l?RN}u_%G>{lu!cafuxOf`{OrJNmH!-&A9}pH?0u)CLwTNV
zrSwjF<msKn16A+K-~){rd^qBpz&&AKmJ%e^DFXLMgsgIy76}m2M}<-6@Nor^vI#VX
z%d+Aw!S-bEiAX3M2!}HG^a+%^cO%<H&Y{k8VZZR^@vy&%WLuKK*$mFD4Eu#*;@c6r
zTf+Km2G6XN%5pifiA5^^_6QQQISwP%5%rr`IT0ezia}oY@K@Lv?~h;uF=)pzY{G+-
zeF&YHAY#%ub`vuuAjgZ-_yTRP36cX}<Xs85b_ic0j-|9ef-mDM#BeS4;;Xy{=w&Cq
zhOd(igJkSCC>NyPDxBwc$U)hyd9k}LXZM@5>)QBM&c?TCLy+%-?;>yf4wyte!gV5j
zk%SKA)?EBmoN|b9+7(%Tk-=W7N1xxpQ@lzqyo0ezt6V;f3p=Zxo5J@S8>@bh!H<0V
z2>H*{SO&k$;I~zO;3b1UNxIz*>Gs+!PRfL~G?7c$a{QH>m8Sc*m+a{8Gdt>k5l8=Y
I0{hqh0pjb>)&Kwi

literal 4467
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
JX*>3>{{aTXYkB|x

diff --git a/src/datastructures/FormalContext.java b/src/datastructures/FormalContext.java
index 3c7b990..c0ae329 100644
--- a/src/datastructures/FormalContext.java
+++ b/src/datastructures/FormalContext.java
@@ -24,7 +24,7 @@ public FormalContext() {
 	}
 	
 	//the BitSet is created at the time of the object being added to the context
-	public void addObject(FormalObject object){
+	public void createAndAddObject(FormalObject object){
 		BitSet intent = new BitSet();
 		for(String attribute : object.getAttributes()){
 			if(!dic.containsAttribute(attribute))
@@ -36,6 +36,10 @@ public void addObject(FormalObject object){
 		objects.add(object);
 	}
 	
+	public void addObject(FormalObject obj) {
+		objects.add(obj);
+	}
+	
 	private void countAttribute(String attribute) {
 		if(!attributeSupport.containsKey(attribute))
 			attributeSupport.put(attribute, 1);
diff --git a/src/datastructures/Lattice.java b/src/datastructures/Lattice.java
index cf237e3..5fba0cb 100644
--- a/src/datastructures/Lattice.java
+++ b/src/datastructures/Lattice.java
@@ -18,6 +18,7 @@ public class Lattice {
 	private ArrayList<LatticeNode> nodes;
 	private ArrayList<LatticeEdge> edges;
 	private HashMap<Integer, ArrayList<LatticeNode>> nodesByLevel;
+	private FormalContext context;
 	private int currentNodeNumber;
 	private Dictionary dic;
 	private BitSet lastMergedInto; //used to keep track of which node has last been merged into in the tinker algorithm
@@ -26,9 +27,10 @@ public class Lattice {
 	private ContextCleanser cc;
 	private long time;
 	
-	public Lattice(Dictionary _dic) {
+	public Lattice(Dictionary _dic, FormalContext _context) {
 		this.nodes = new ArrayList<LatticeNode>();
 		this.edges = new ArrayList<LatticeEdge>();
+		this.context = _context;
 		this.currentNodeNumber = 0;
 		this.dic = _dic;
 		this.nodesByLevel = new HashMap<Integer, ArrayList<LatticeNode>>();
@@ -49,8 +51,9 @@ public void clear() {
 	public String latticeStats() { 
 //		return "Nodes: " + nodes.size() + "\twith own objects: " + nodesWithOwnObjects() + "\tedges: " + edges.size() 
 //		+ "\tclusterIndex: " + String.format("%.3f", clusterIndex()) + "\tcleanliness: " + String.format("%.1f", cleanliness()) + "%";
-		return numberOfAttributes() + "\t" + nodes.size() + "\t" + nodesWithOwnObjects() + "\t" + edges.size() + "\t" + String.format("%.3f", clusterIndex()) + "\t" + String.format("%.1f", cleanliness())
-		+ "\t" + String.format("%.1f", nullPercentage()) + "\t" + String.format("%.1f", legacyPercentage()) + "\t" + time;
+		return context.getObjects().size() + "\t" + types() + "\t" + numberOfAttributes() + "\t" + nodes.size() + "\t" + nodesWithOwnObjects() 
+		+ "\t" + edges.size() + "\t" + String.format("%.3f", clusterIndex()) + "\t" + String.format("%.1f", inMajority())
+		+ "\t" + String.format("%.1f", inCleanNodes()) + "\t" + String.format("%.1f", nullPercentage()) + "\t" + String.format("%.1f", legacyPercentage()) + "\t" + time;
 	}
 	
 	private int numberOfAttributes() {
@@ -315,7 +318,7 @@ public void setLastMergedInto(BitSet intent) {
 		this.lastMergedInto = intent;
 	}
 	
-	public double cleanliness() {
+	public double inMajority() {
 		int majority = 0;
 		int total = 0;
 		for(LatticeNode node : nodes) {
@@ -327,6 +330,19 @@ public double cleanliness() {
 		return ((double)majority/(double)total)*100;
 	}
 	
+	public double inCleanNodes() {
+		int inClean = 0;
+		int total = 0;
+		for(LatticeNode node : nodes) {
+			if(node.hasOwnObjects()){
+				if(node.typesOfFormalObjects(node.ownObjects()).substring(0,4).equals("100%"))
+					inClean += node.numberOfOwnObjects();
+				total += node.numberOfOwnObjects();
+			}
+		}
+		return ((double)inClean/(double)total)*100;
+	}
+	
 	public Boolean bookkeepingIsNull() {
 		return bookkeeping == null;
 	}
@@ -436,6 +452,7 @@ public void retrofitSingletons() {
 			bestFit.addToOwnObjects(single);
 			//update the bookkeeping datastructure, ie. add the formalObject to the hash of the closest node. Do not re-compute anything.
 			bookkeeping.get(cc.bitsetHash(bestFit.getIntent())).add(single);
+			context.addObject(single);
 		}
 	}
 
@@ -459,6 +476,13 @@ private LatticeNode findBestNodeFit(FormalObject single) {
 //		System.out.println("Retrofitting " + single.getIntent() + " into " + bestFit.getIntent() + " (score = " + bestFitScore + ", own = " + bestFitOwnObjects + ")");
 		return bestFit;
 	}
+	
+	public int types() {
+		HashSet<String> types = new HashSet<String>();
+		for(FormalObject obj : context.getObjects())
+			types.add(obj.getName());
+		return types.size();
+	}
 
 	public void setTime(long timeElapsed) {
 		this.time = timeElapsed;
diff --git a/src/datastructures/LatticeNode.java b/src/datastructures/LatticeNode.java
index a06ee7e..332996a 100644
--- a/src/datastructures/LatticeNode.java
+++ b/src/datastructures/LatticeNode.java
@@ -167,7 +167,7 @@ public int majority() {
 		return counts.get(majorityType);
 	}
 	
-	private String typesOfFormalObjects(HashSet<FormalObject> set) {
+	protected String typesOfFormalObjects(HashSet<FormalObject> set) {
 		if(set.size() > 0) {
 			HashMap<String, Integer> counts = countObjectTypes(set);
 			if(counts.keySet().size() == 1)
diff --git a/src/driver/Driver.java b/src/driver/Driver.java
index f68d854..9e76bb1 100644
--- a/src/driver/Driver.java
+++ b/src/driver/Driver.java
@@ -11,69 +11,64 @@
 
 public class Driver {
 	public static void main(String[] args){
-		String folder = "C:\\Users\\Luca Liechti\\Desktop\\IESL";
+		String folder200 = "C:\\Users\\Luca Liechti\\Desktop\\IESL200";
+		String folder2000 = "C:\\Users\\Luca Liechti\\Desktop\\IESL2000";
 		String repoFolder = "C:\\Users\\Luca Liechti\\Dropbox\\Uni\\!BSc\\NoSQL repos\\";
-		String ieslFolder = "C:\\Users\\Luca Liechti\\Desktop\\IESL\\";
 		String outputFolder = "C:\\Users\\Luca Liechti\\Dropbox\\Uni\\!BSc\\context files\\";	
 		String graphvizFolder = "C:\\Users\\Luca Liechti\\Dropbox\\Uni\\!BSc\\graphviz files\\";
-		ArrayList<String> docs = new ArrayList<String>();
+		ArrayList<String> docs200 = new ArrayList<String>();
+		ArrayList<String> docs2000 = new ArrayList<String>();
 		ParserFactory factory = new ParserFactory();
 		
 		//CONFIGURE HERE
 		double mergeStop = 0d;
-		Boolean deleteRareAttributes = true;
-		Boolean retroFitSingletons = true;
+		Boolean deleteRareAttributes = false;
+		Boolean retroFitSingletons = false;
 		
 //		//add XML repos
-//		docs.add(repoFolder + "XML\\mondial.xml");
-//		docs.add(repoFolder + "XML\\SigmodRecord.xml");
-//		docs.add(repoFolder + "XML\\ebay.xml");
-		docs.add(repoFolder + "XML\\DBLP\\1000Lattice.xml");		//
-		docs.add(repoFolder + "XML\\DBLP\\316NoSql.xml");			//
-		docs.add(repoFolder + "XML\\DBLP\\1000FCA.xml");			//
-		docs.add(repoFolder + "XML\\DBLP\\1000Schema.xml");			//
-		
-		//add IESL repos
-//		docs.add(ieslFolder + "gp-bibliography.bib");
-//		docs.add(ieslFolder + "visinfo.zib.de#EVlib#Bibliography#EVL-1998.bib");
+//		docs2000.add(repoFolder + "XML\\DBLP\\1000Lattice.xml");
+//		docs2000.add(repoFolder + "XML\\DBLP\\316NoSql.xml");
+//		docs2000.add(repoFolder + "XML\\DBLP\\1000FCA.xml");
+//		docs2000.add(repoFolder + "XML\\DBLP\\1000Schema.xml");
 		
 		//add BibTex repos
-//		docs.add(repoFolder + "BibTex\\BordatTest.bib");
-//		docs.add(repoFolder + "BibTex\\Test2.bib");
-		docs.add(repoFolder + "BibTex\\scg.bib");					//
-		docs.add(repoFolder + "BibTex\\listb.bib");					//
-		docs.add(repoFolder + "BibTex\\zbMATH\\100Lattice.bib");	//
-		docs.add(repoFolder + "BibTex\\zbMATH\\100Schema.bib");		//
-		docs.add(repoFolder + "BibTex\\zbMATH\\100Algebra.bib");	//
-		docs.add(repoFolder + "BibTex\\zbMATH\\100Groups.bib");		//
+//		docs200.add(repoFolder + "BibTex\\scg.bib");
+//		docs200.add(repoFolder + "BibTex\\listb.bib");
+//		docs2000.add(repoFolder + "BibTex\\zbMATH\\100Lattice.bib");
+//		docs2000.add(repoFolder + "BibTex\\zbMATH\\100Schema.bib");
+//		docs2000.add(repoFolder + "BibTex\\zbMATH\\100Algebra.bib");
+//		docs2000.add(repoFolder + "BibTex\\zbMATH\\100Groups.bib");
 		
 //		//add JSON repos
-		docs.add(repoFolder + "JSON\\SIRA\\alle.js");				//
+		docs2000.add(repoFolder + "JSON\\SIRA\\alle.js");
 
 		//PARSING SINGLE FILES
-		for(String doc : docs)
-			parseDocument(doc, outputFolder, graphvizFolder, factory.makeParser(doc), retroFitSingletons, deleteRareAttributes, mergeStop);
+		for(String doc : docs200)
+			parseDocument(doc, outputFolder, graphvizFolder, factory.makeParser(doc), retroFitSingletons, deleteRareAttributes, mergeStop, 200);
+		for(String doc : docs2000)
+			parseDocument(doc, outputFolder, graphvizFolder, factory.makeParser(doc), retroFitSingletons, deleteRareAttributes, mergeStop, 2000);
 		
 		//PARSING ALL FILES IN FOLDER
-		parseFolder(folder, outputFolder, graphvizFolder, factory, retroFitSingletons, deleteRareAttributes, mergeStop);
+//		parseFolder(folder200, outputFolder, graphvizFolder, factory, retroFitSingletons, deleteRareAttributes, mergeStop, 200);
+//		parseFolder(folder2000, outputFolder, graphvizFolder, factory, retroFitSingletons, deleteRareAttributes, mergeStop, 200);
 		
 		System.out.println("All done.");
 	}
 	
-	private static void parseDocument(String doc, String outputFolder, String graphvizFolder, NoSQLParser parser, Boolean retroFitSingletons, Boolean deleteRareAttributes, double mergeStop){
+	private static void parseDocument(String doc, String outputFolder, String graphvizFolder, NoSQLParser parser, Boolean retroFitSingletons, Boolean deleteRareAttributes, double mergeStop, int obj){
 		System.out.println("Parsing file " + doc);
-		ArrayList<FormalObject> importedContext = parser.parseFile(doc);
+		ArrayList<FormalObject> importedContext = parser.parseFile(doc, obj);
 		FormalContext fc = new FormalContext();
 		for(FormalObject object : importedContext)
-			fc.addObject(object);
+			fc.createAndAddObject(object);
 		fc.exportContextToFile(outputFolder + parser.getTargetContextFilename(doc));
 		
 		LatticeBuilder lb = new LatticeBuilder(fc);
 		Lattice lattice = lb.buildLattice();
 		lattice.exportLatticeToFile(graphvizFolder + "0a_original_" + parser.getTargetLatticeFilename(doc));
 		
-		System.out.println("\nNr\tScore\tAttr\tNodes\tWithOwn\tedges\tindex\tclean\tnull\tleg\ttime");
-		System.out.println("-----------------------------------------------------------------------------------");
+		System.out.println("\nNr\tScore\tObjects\tTypes\tAttr\tNodes\tWithOwn\tedges\tindex\tmajor\tinClean\tnull\tleg\ttime");
+		System.out.println("------------------------------------------------------------------------------------------------------------");
 		System.out.println("orig\t---" + "\t" + lattice.latticeStats());
 		ContextCleanser cc = new ContextCleanser(fc, lattice);
 		
@@ -102,11 +97,11 @@ private static void parseDocument(String doc, String outputFolder, String graphv
 		while(score > mergeStop) {
 			lattice.clear();
 			lattice = lb.buildLattice();
-			System.out.println(i + "\t" + String.format("%.2f", score) + "\t" + lattice.latticeStats());
+//			System.out.println(i + "\t" + String.format("%.2f", score) + "\t" + lattice.latticeStats());
 			lattice.exportLatticeToFile(graphvizFolder + (i++) + "_" + parser.getTargetLatticeFilename(doc));
 			score = cc.tinker();
 		}
-		System.out.println("final (" + (--i) + ")\t" + lattice.latticeStats());
+		if(!retroFitSingletons) System.out.println("final (" + (--i) + ")\t" + lattice.latticeStats());
 		
 		///SINGLETONS PT. 2///
 		if(retroFitSingletons) {
@@ -115,14 +110,14 @@ private static void parseDocument(String doc, String outputFolder, String graphv
 			lattice.exportLatticeToFile(graphvizFolder + i + "_retroFit_" + parser.getTargetLatticeFilename(doc));
 		}
 		
-		System.out.println("-----------------------------------------------------------------------------------\n\n");
+		System.out.println("------------------------------------------------------------------------------------------------------------\n\n");
 	}
 	
-	private static void parseFolder(String inFolder, String outFolder, String gvFolder, ParserFactory fac, Boolean retroFitSingletons, Boolean deleteRareAttributes, double mergeStop) {
+	private static void parseFolder(String inFolder, String outFolder, String gvFolder, ParserFactory fac, Boolean retroFitSingletons, Boolean deleteRareAttributes, double mergeStop, int obj) {
 		File fold = new File(inFolder);
 		assert(fold.isDirectory());
 		String[] inFiles = fold.list();
 		for(int i = 0; i < inFiles.length; i++)
-			parseDocument(inFolder + "\\" + inFiles[i], outFolder, gvFolder, fac.makeParser(inFiles[i]), retroFitSingletons, deleteRareAttributes, mergeStop);
+			parseDocument(inFolder + "\\" + inFiles[i], outFolder, gvFolder, fac.makeParser(inFiles[i]), retroFitSingletons, deleteRareAttributes, mergeStop, obj);
 	}
 }
\ No newline at end of file
diff --git a/src/driver/LatticeBuilder.java b/src/driver/LatticeBuilder.java
index 50b2c4b..6ad3ead 100644
--- a/src/driver/LatticeBuilder.java
+++ b/src/driver/LatticeBuilder.java
@@ -20,7 +20,7 @@ public class LatticeBuilder {
 
 	public LatticeBuilder(FormalContext _context) {
 		this.context = _context;
-		this.lattice = new Lattice(_context.getDictionary());
+		this.lattice = new Lattice(_context.getDictionary(), _context);
 		this.alreadyAddedObjects = new ArrayList<FormalObject>();
 		this.maximalConcept = null;
 	}
@@ -30,10 +30,15 @@ public Lattice buildLattice(){
 		//Norris algorithm
 		for(FormalObject g : context.getObjects()) add(g);
 		lattice.setTime(timer.timeElapsed());
+//		System.out.println("Added all objects in " + timer.timeElapsed() + " ms."); timer.reset();
 		addNodeWithAllAttributes();
+//		System.out.println("Added node with all attributes in " + timer.timeElapsed() + " ms."); timer.reset();
 		computeExtents();
+//		System.out.println("Computed extents in " + timer.timeElapsed() + " ms."); timer.reset();
 		lattice.computeEdges();
+//		System.out.println("Computed edges in " + timer.timeElapsed() + " ms."); timer.reset();
 		lattice.computeAttributes();
+//		System.out.println("Computed which attribute enters where in " + timer.timeElapsed() + " ms.");
 		if(lattice.bookkeepingIsNull()) lattice.initialiseBookkeeping();
 		alreadyAddedObjects.clear();
 		return lattice;
diff --git a/src/parsers/BibTexParser.java b/src/parsers/BibTexParser.java
index 413dd54..b36362f 100644
--- a/src/parsers/BibTexParser.java
+++ b/src/parsers/BibTexParser.java
@@ -10,9 +10,9 @@
 
 public class BibTexParser implements NoSQLParser {
 	
-	public ArrayList<FormalObject> parseFile(String file){
+	public ArrayList<FormalObject> parseFile(String file, int MAX_OBJECTS){
 		ArrayList<String> splitObjects = splitFile(file); //split the input file
-		return createFormalObjects(splitObjects); //extract attributes from split objects		
+		return createFormalObjects(splitObjects, MAX_OBJECTS); //extract attributes from split objects		
 	}
 
 	private ArrayList<String> splitFile(String file) {
@@ -45,7 +45,7 @@ private ArrayList<String> splitFile(String file) {
 		return splitString;
 	}
 	
-	private ArrayList<FormalObject> createFormalObjects(ArrayList<String> splitObjects) {
+	private ArrayList<FormalObject> createFormalObjects(ArrayList<String> splitObjects, int MAX_OBJECTS) {
 		ArrayList<FormalObject> parsedObjects = new ArrayList<FormalObject>();
 		System.out.print("Parsing objects to context... ");
 		//extract the attributes from each object
@@ -67,10 +67,11 @@ else if(lines[i].matches("@.*\\{.*")){
 			}
 			currentObject.setAttributes(attributes);
 			currentObject.setName(name);
-			if(++k <= 200) //Comment in/out to look at all/n objects
+			if(MAX_OBJECTS == 0 || ++k <= MAX_OBJECTS)
 				parsedObjects.add(currentObject); 
 		}
 		System.out.println("done.");
+		assert (parsedObjects.size() <= MAX_OBJECTS);
 		return parsedObjects;
 	}
 
diff --git a/src/parsers/JSONParser.java b/src/parsers/JSONParser.java
index e589592..586919e 100644
--- a/src/parsers/JSONParser.java
+++ b/src/parsers/JSONParser.java
@@ -17,9 +17,9 @@ public class JSONParser implements NoSQLParser {
 	private String nameAttribute = "file";
 
 	@Override
-	public ArrayList<FormalObject> parseFile(String file) {
+	public ArrayList<FormalObject> parseFile(String file, int MAX_OBJECTS) {
 		JSONArray jarray = extractJSONarray(file);
-		return(createFormalObjects(jarray));
+		return(createFormalObjects(jarray, MAX_OBJECTS));
 	}
 
 	private JSONArray extractJSONarray(String file) {
@@ -34,11 +34,12 @@ private JSONArray extractJSONarray(String file) {
 		return array;
 	}
 	
-	private ArrayList<FormalObject> createFormalObjects(JSONArray jarray) {
+	private ArrayList<FormalObject> createFormalObjects(JSONArray jarray, int MAX_OBJECTS) {
 		ArrayList<FormalObject> parsedObjects = new ArrayList<FormalObject>();
 		System.out.print("Parsing objects to context... ");
+		if(MAX_OBJECTS == 0) MAX_OBJECTS = jarray.length();	//declare how many objects we want. If all, just parse the whole array
 		try{
-			for(int i = 0; i < jarray.length(); i++) {
+			for(int i = 0; i < MAX_OBJECTS; i++) {
 				FormalObject formalObj = new FormalObject();
 				ArrayList<String> formalAttr = new ArrayList<String>();
 				JSONObject obj = jarray.getJSONObject(i);
@@ -53,6 +54,7 @@ private ArrayList<FormalObject> createFormalObjects(JSONArray jarray) {
 		}
 		catch(JSONException jsone) { jsone.printStackTrace(); }
 		System.out.print("Done.");
+		assert (parsedObjects.size() <= MAX_OBJECTS);
 		return parsedObjects;
 	}
 
diff --git a/src/parsers/NoSQLParser.java b/src/parsers/NoSQLParser.java
index 59c00c7..47dfc83 100644
--- a/src/parsers/NoSQLParser.java
+++ b/src/parsers/NoSQLParser.java
@@ -6,7 +6,7 @@
 
 public interface NoSQLParser {
 	
-	public ArrayList<FormalObject> parseFile(String file);
+	public ArrayList<FormalObject> parseFile(String file, int nrObj);
 
 	public String getTargetContextFilename(String doc);
 	
diff --git a/src/parsers/XMLParser.java b/src/parsers/XMLParser.java
index 5fe0c6a..36749f5 100644
--- a/src/parsers/XMLParser.java
+++ b/src/parsers/XMLParser.java
@@ -19,14 +19,15 @@ public class XMLParser implements NoSQLParser {
 	private String wantedObjects = "info";
 	private String nameAttribute = "type";
 	
-	public ArrayList<FormalObject> parseFile(String file){
-		ArrayList<Element> wantedElements = extractElements(file); //split the input file
+	public ArrayList<FormalObject> parseFile(String file, int MAX_OBJECTS){
+		ArrayList<Element> wantedElements = extractElements(file, MAX_OBJECTS); //split the input file
 		return createFormalObjects(wantedElements); //extract attributes from split objects		
 	}
 
-	private ArrayList<Element> extractElements(String file) {
+	private ArrayList<Element> extractElements(String file, int MAX_OBJECTS) {
 		ArrayList<Element> wantedElements = new ArrayList<Element>();
 		ElementFilter ef = new ElementFilter();
+		int numberOfParsedObjects = 0;
 		try {
 			File inputFile = new File(file);
 			SAXBuilder saxBuilder = new SAXBuilder();
@@ -35,11 +36,15 @@ private ArrayList<Element> extractElements(String file) {
 			Iterator<Element> allElementsIterator = rootElement.getDescendants(ef);
 			while(allElementsIterator.hasNext()) {
 				Element currentElement = allElementsIterator.next();
-				if(currentElement.getName().equals(wantedObjects)) wantedElements.add(currentElement);
+				if(currentElement.getName().equals(wantedObjects) && (MAX_OBJECTS == 0 || MAX_OBJECTS < numberOfParsedObjects)) {
+					wantedElements.add(currentElement);
+					numberOfParsedObjects++;
+				}
 			}
 		}
 		catch (JDOMException e) { e.printStackTrace(); }
 		catch (IOException e) { e.printStackTrace(); }
+		assert ((MAX_OBJECTS == 0 || numberOfParsedObjects <= MAX_OBJECTS) && wantedElements.size() <= MAX_OBJECTS);
 		return wantedElements;
 	}