importing to Intellij

gangeli · Jul 27, 2011 · 82a6cf1 · 82a6cf1
1 parent f958002
commit 82a6cf1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 38 deletions.
diff --git a/run b/run
@@ -41,7 +41,7 @@ env!(
 			'bestRandom',
 			'bestShallow'),
 		selo(0,'initMethod','uniform','random'),
-		selo(2,'lexTagMethod',
+		selo(1,'lexTagMethod',
 			'PCFG',
 			'CRF',
 			'GOLD'),
@@ -72,8 +72,8 @@ env!(
 		o('train', '1-9'),
 		o('dev', '9-10'),
 		o('test', '101-111'),
-#		o('train', '1-101'),
-#		o('dev', '101-151'),
+		o('train', '1-101'),
+		o('dev', '101-151'),
 #		o('test', '151-187'),
 		o('devTest', true),
 
@@ -84,7 +84,7 @@ env!(
 		o('useSeed'),
 		o('seed','42'),
 		o('goldTagFile', 'aux/sentences-100-tagged'),
-		o('printAllParses'),
+#		o('printAllParses'),
 		#(debug programs)
 		selo(0,'runDebug',
 			'none',

diff --git a/src/time/Time.scala b/src/time/Time.scala
@@ -68,44 +68,10 @@ case class Range(begin:Time, end:Time) {
 			//(make range)
 			val begin:Time = mkBegin(groundedAbstr.begin, grounded.begin)
 			val end:Time = mkEnd(groundedAbstr.end, grounded.end)
-//			val begin:Time = Time(null,null,List[Time=>Time]( (ground:Time) => {
-//					assert(ground.isGrounded, "Modifying with ungrounded time")
-//					mkBegin(grounded.begin,abstr.begin(ground))
-//				}))
-//			val end:Time = Time(null,null,List[Time=>Time]( (ground:Time) => {
-//					assert(ground.isGrounded, "Modifying with ungrounded time")
-//					mkEnd(grounded.end,abstr.end(ground))
-//				}))
 			//(make range)
 			Range(begin,end)
 		}
 	}
-//	def ^(r:Range):Range = {
-//		if( (!isGrounded && r.isGrounded) || (isGrounded && !r.isGrounded) ){
-//			//--Case: grounded and abstract
-//			val grounded = if(isGrounded) this else r
-//			val abstr = if(isGrounded) r else this
-//			abstr(grounded.begin)
-//		} else if(isGrounded){
-//			//--Case: grounded and grounded
-//			val begin 
-//				=if(this.begin.base.compareTo(r.begin.base) > 0) this.begin else r.begin
-//			val end 
-//				=if(this.end.base.compareTo(r.end.base) < 0) this.end else r.end
-//			Range(begin,end)
-//		} else {
-//			//--Case: abstract and abstract
-//			//(identify larger and smaller)
-//			val larger = if(this.norm > r.norm) this else r
-//			val smaller = if(this.norm > r.norm) r else this
-//			//(take begin from the larger)
-//			val newBegin = larger.begin.alsoMod(smaller.begin)
-//			//(take end from larger.begin+smaller.norm)
-//			val newEnd = newBegin+smaller.norm
-//			//(return)
-//			Range(newBegin, newEnd)
-//		}
-//	}
 	def cons(other:Range):Range = Range(this.begin, other.end)
 	def apply(ground:Time):Range = {
 		assert(ground.isGrounded, "grounding range with ungrounded time")