[procilege commit] r71 - in trunk/procilege/src: main/java/merisis/contentcloud/impl main/java/merisis/traitspace ma...
codesite...@google.com
Date: Thu Jun 7 00:40:28 2007
New Revision: 71
Added:
trunk/procilege/src/main/java/merisis/traitspace/MerisisVM.java
- copied, changed from r70, /trunk/procilege/src/main/java/merisis/traitspace/TraitSpace.java
Removed:
trunk/procilege/src/main/java/merisis/traitspace/TraitSpace.java
Modified:
trunk/procilege/src/main/java/merisis/contentcloud/impl/ContentCloudImpl.java
trunk/procilege/src/main/java/merisis/traitspace/Morphism.java
trunk/procilege/src/main/java/merisis/traitspace/impl/SketchImpl.java
trunk/procilege/src/main/java/merisis/traitspace/impl/TraitSpaceImpl.java
trunk/procilege/src/main/java/procilege/impl/ComputationalEntityMgr.java
trunk/procilege/src/main/java/procilege/impl/DefaultProcilegeModule.java
trunk/procilege/src/main/java/procilege/impl/PrivFormAnalysisImpl.java
trunk/procilege/src/test/java/merisis/contentcloud/AbstractContentCloudTest.java
trunk/procilege/src/test/java/merisis/contentcloud/ContentCloudTest1.java
trunk/procilege/src/test/java/merisis/traitspace/AbstractTraitSpaceTest.java
trunk/procilege/src/test/java/merisis/traitspace/MorphismIsaTest.java
trunk/procilege/src/test/java/merisis/traitspace/MorphismTest1.java
trunk/procilege/src/test/java/merisis/traitspace/Sketch1Test.java
trunk/procilege/src/test/java/merisis/traitspace/Sketch2Test.java
trunk/procilege/src/test/java/merisis/traitspace/Sketch3Test.java
trunk/procilege/src/test/java/merisis/traitspace/Sketch4Test.java
trunk/procilege/src/test/java/merisis/traitspace/Sketch5Test.java
trunk/procilege/src/test/java/merisis/traitspace/Sketch6Test.java
trunk/procilege/src/test/java/merisis/traitspace/Sketch7Test.java
trunk/procilege/src/test/java/merisis/traitspace/Spectrum1Test.java
trunk/procilege/src/test/java/procilege/test/TestZero.java
trunk/procilege/src/test/java/procilege/test/pal/AbstractPalTest.java
trunk/procilege/src/test/java/procilege/test/pal/ComputationalEntityMgrTest1.java
trunk/procilege/src/test/java/procilege/test/pal/ComputationalEntityMgrTest2.java
trunk/procilege/src/test/java/procilege/test/pal/EntityIsATest1.java
trunk/procilege/src/test/java/procilege/test/pal/EntityPropertyTest1.java
trunk/procilege/src/test/java/procilege/test/pal/RecursivePrivilegeTest.java
trunk/procilege/src/test/java/procilege/test/simplecase/SimpleCaseTest.java
Log:
[Issue 37] Refined the interfaces of merisis.
Modified: trunk/procilege/src/main/java/merisis/contentcloud/impl/ContentCloudImpl.java
==============================================================================
--- trunk/procilege/src/main/java/merisis/contentcloud/impl/ContentCloudImpl.java (original)
+++ trunk/procilege/src/main/java/merisis/contentcloud/impl/ContentCloudImpl.java Thu Jun 7 00:40:28 2007
@@ -7,7 +7,7 @@
import java.util.logging.Logger;
import merisis.contentcloud.ContentCloud;
-import merisis.traitspace.TraitSpace;
+import merisis.traitspace.MerisisVM;
import com.google.inject.Inject;
@@ -17,7 +17,7 @@
private Logger logger;
@Inject
- private TraitSpace cvm;
+ private MerisisVM cvm;
private HashMap<Long, Object> base = new HashMap<Long, Object>();
Copied: trunk/procilege/src/main/java/merisis/traitspace/MerisisVM.java (from r70, /trunk/procilege/src/main/java/merisis/traitspace/TraitSpace.java)
==============================================================================
--- /trunk/procilege/src/main/java/merisis/traitspace/TraitSpace.java (original)
+++ trunk/procilege/src/main/java/merisis/traitspace/MerisisVM.java Thu Jun 7 00:40:28 2007
@@ -1,12 +1,12 @@
package merisis.traitspace;
-public interface TraitSpace {
+public interface MerisisVM {
long[] background();
void zoomin(long... foucs);
- void pickup(long... points);
+ void source(long... points);
void autobeam();
@@ -14,7 +14,7 @@
void focus(long... guides);
- void tspectrum(long... traits);
+ void tprism(long... traits);
void tcomplementary();
Modified: trunk/procilege/src/main/java/merisis/traitspace/Morphism.java
==============================================================================
--- trunk/procilege/src/main/java/merisis/traitspace/Morphism.java (original)
+++ trunk/procilege/src/main/java/merisis/traitspace/Morphism.java Thu Jun 7 00:40:28 2007
@@ -19,7 +19,7 @@
private Logger logger;
@Inject
- private TraitSpace ts;
+ private MerisisVM ts;
public void set(long f, long a, long b) {
@@ -131,7 +131,7 @@
private OpenBitSet infimumB(OpenBitSet infimum, long f, long a) {
- ts.pickup(f, a);
+ ts.source(f, a);
ts.focus();
long[] suspicious = ts.read();
if (logger.isLoggable(Level.FINEST)) {
@@ -157,7 +157,7 @@
OpenBitSet aparents = new OpenBitSet();
for (int j = 0; j < sp.length; j++) {
long aparent = sp[j];
- ts.pickup(f, a);
+ ts.source(f, a);
ts.focus(aparent);
if (ts.read() != null) {
aparents.set(aparent);
@@ -180,7 +180,7 @@
private OpenBitSet infimumA(OpenBitSet infimum, long f, long b) {
- ts.pickup(f, b);
+ ts.source(f, b);
ts.focus();
long[] suspects = ts.read();
if (logger.isLoggable(Level.FINEST)) {
@@ -206,7 +206,7 @@
for (int j = 0; j < sp.length; j++) {
- ts.pickup(f,b);
+ ts.source(f,b);
ts.focus(sp[j]);
if (ts.read() != null) {
continue SUSPECT;
@@ -231,7 +231,7 @@
for (int j = 0; j < sp.length; j++) {
- ts.pickup(b);
+ ts.source(b);
ts.focus(sp[j]);
if (ts.read() != null)
continue;
@@ -257,7 +257,7 @@
for (int j = 0; j < sp.length; j++) {
- ts.pickup(f);
+ ts.source(f);
ts.focus(sp[j]);
if (ts.read() != null)
continue;
Modified: trunk/procilege/src/main/java/merisis/traitspace/impl/SketchImpl.java
==============================================================================
--- trunk/procilege/src/main/java/merisis/traitspace/impl/SketchImpl.java (original)
+++ trunk/procilege/src/main/java/merisis/traitspace/impl/SketchImpl.java Thu Jun 7 00:40:28 2007
@@ -162,7 +162,7 @@
continue;
}
-
+
logger.info("node: " + node);
long[] preivios = history.previous(node);
@@ -219,7 +219,7 @@
long[] preivios = history.previous(node);
if (preivios == null)
continue;
-
+
for (int j = 0; j < preivios.length; j++) {
long point = preivios[j];
@@ -243,22 +243,8 @@
}
}
- // resolve the minimum of traits
OpenBitSet min = new OpenBitSet();
- if (!nselected.isEmpty()) {
- long p = nselected.nextSetBit(0);
- min.set(p);
- for (p = nselected.nextSetBit(p + 1); p >= 0; p = nselected
- .nextSetBit(p + 1)) {
-
- OpenBitSet fp1 = footprintsMap.get(p);
- if (OpenBitSet.andNotCount(fp1, min) > 0) {
- min.andNot(fp1);
- min.set(p);
- }
- }
- }
-
+ minimumOfTraits(min, nselected);
tcomplementary = min;
if (logger.isLoggable(Level.FINEST)) {
@@ -270,6 +256,24 @@
}
return tcomplementary;
+ }
+
+ private void minimumOfTraits(OpenBitSet minimum, OpenBitSet nselected) {
+
+ if (nselected == null || nselected.isEmpty())
+ return;
+
+ long p = nselected.nextSetBit(0);
+ minimum.set(p);
+ for (p = nselected.nextSetBit(p + 1); p >= 0; p = nselected
+ .nextSetBit(p + 1)) {
+
+ OpenBitSet fp1 = footprintsMap.get(p);
+ if (OpenBitSet.andNotCount(fp1, minimum) > 0) {
+ minimum.andNot(fp1);
+ minimum.set(p);
+ }
+ }
}
private void search() {
Modified: trunk/procilege/src/main/java/merisis/traitspace/impl/TraitSpaceImpl.java
==============================================================================
--- trunk/procilege/src/main/java/merisis/traitspace/impl/TraitSpaceImpl.java (original)
+++ trunk/procilege/src/main/java/merisis/traitspace/impl/TraitSpaceImpl.java Thu Jun 7 00:40:28 2007
@@ -7,14 +7,14 @@
import merisis.sense.SenseMaker;
import merisis.traitspace.History;
import merisis.traitspace.PointGroup;
-import merisis.traitspace.TraitSpace;
+import merisis.traitspace.MerisisVM;
import merisis.util.BitUtil;
import org.apache.solr.util.OpenBitSet;
import com.google.inject.Inject;
-public class TraitSpaceImpl implements TraitSpace {
+public class TraitSpaceImpl implements MerisisVM {
@Inject
private History history;
@@ -43,7 +43,7 @@
viewStack.push(hv);
}
- public void pickup(long... points) {
+ public void source(long... points) {
ProcessContext ctx = getProcessContext();
@@ -111,7 +111,7 @@
ctx.thisresult = bs;
}
- public void tspectrum(long... traits) {
+ public void tprism(long... traits) {
ProcessContext ctx = getProcessContext();
Modified: trunk/procilege/src/main/java/procilege/impl/ComputationalEntityMgr.java
==============================================================================
--- trunk/procilege/src/main/java/procilege/impl/ComputationalEntityMgr.java (original)
+++ trunk/procilege/src/main/java/procilege/impl/ComputationalEntityMgr.java Thu Jun 7 00:40:28 2007
@@ -10,7 +10,7 @@
import merisis.sense.SenseMaker;
import merisis.traitspace.AmbiguityException;
import merisis.traitspace.Morphism;
-import merisis.traitspace.TraitSpace;
+import merisis.traitspace.MerisisVM;
import merisis.util.BitUtil;
import procilege.compiler.PalCompiler;
@@ -41,7 +41,7 @@
private ExprFormatter ftr;
@Inject
- private TraitSpace ts;
+ private MerisisVM ts;
@Inject
private PalCompiler pal;
@@ -191,6 +191,9 @@
return null;
}
+ /**
+ * STRUCTURE: ((entity, property, meta_entity_prop), value)
+ */
public void setEntityProperty(Name entity, String property, Object value) {
if (initial)
@@ -199,7 +202,7 @@
long subject = ((NameImpl) entity).nameId;
long predicate = smr.sense(new QName(PROPS_NS, property));
- ts.pickup(subject, predicate, namePropEntities);
+ ts.source(subject, predicate, namePropEntities);
ts.focus();
long[] onto = ts.read();
@@ -243,38 +246,23 @@
ts.exit();
}
- if (onto == null || onto.length == 0)
- return null;
-
- if (onto.length > 1)
- throw new AmbiguityException(null);
-
ts.autobeam();
try {
- ts.focus(onto[0]);
+ // NOTICE: changes the souces instead of the focus.
+ ts.tprism(subject, predicate, namePropEntities);
+ ts.tcomplementary();
onto = ts.read();
} finally {
ts.exit();
}
- long cid = -1;
- for (int i = 0; i < onto.length; i++) {
-
- ts.pickup(namePropEntities);
- ts.focus(onto[i]);
- if (ts.read() != null)
- continue;
-
- if (cid > 0)
- throw new AmbiguityException(null);
-
- cid = onto[i];
- }
-
- if (cid < 0)
+ if (onto == null || onto.length == 0)
return null;
-
- return cloud.retrieve(cid);
+
+ if (onto.length > 1)
+ throw new AmbiguityException(null);
+
+ return cloud.retrieve(onto[0]);
}
public void setIsA(Name subject, Name object) {
Modified: trunk/procilege/src/main/java/procilege/impl/DefaultProcilegeModule.java
==============================================================================
--- trunk/procilege/src/main/java/procilege/impl/DefaultProcilegeModule.java (original)
+++ trunk/procilege/src/main/java/procilege/impl/DefaultProcilegeModule.java Thu Jun 7 00:40:28 2007
@@ -5,7 +5,7 @@
import merisis.sense.SenseMaker;
import merisis.sense.impl.SenseMakerImpl;
import merisis.traitspace.History;
-import merisis.traitspace.TraitSpace;
+import merisis.traitspace.MerisisVM;
import merisis.traitspace.impl.MemoryHistoryImpl;
import merisis.traitspace.impl.TraitSpaceImpl;
import procilege.Procilege;
@@ -31,7 +31,7 @@
.in(Scopes.SINGLETON);
bind(ContentCloud.class).to(ContentCloudImpl.class) //
.in(Scopes.SINGLETON);
- bind(TraitSpace.class).to(TraitSpaceImpl.class) //
+ bind(MerisisVM.class).to(TraitSpaceImpl.class) //
.in(Scopes.SINGLETON);
bind(SenseMaker.class).to(SenseMakerImpl.class) //
.in(Scopes.SINGLETON);
Modified: trunk/procilege/src/main/java/procilege/impl/PrivFormAnalysisImpl.java
==============================================================================
--- trunk/procilege/src/main/java/procilege/impl/PrivFormAnalysisImpl.java (original)
+++ trunk/procilege/src/main/java/procilege/impl/PrivFormAnalysisImpl.java Thu Jun 7 00:40:28 2007
@@ -7,7 +7,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import merisis.traitspace.TraitSpace;
+import merisis.traitspace.MerisisVM;
import org.apache.solr.util.OpenBitSet;
@@ -36,7 +36,7 @@
private ExprExpand expand;
@Inject
- private TraitSpace ts;
+ private MerisisVM ts;
@Inject
private ExprEvaluation comp;
Modified: trunk/procilege/src/test/java/merisis/contentcloud/AbstractContentCloudTest.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/contentcloud/AbstractContentCloudTest.java (original)
+++ trunk/procilege/src/test/java/merisis/contentcloud/AbstractContentCloudTest.java Thu Jun 7 00:40:28 2007
@@ -6,7 +6,7 @@
import merisis.sense.SenseMaker;
import merisis.traitspace.History;
-import merisis.traitspace.TraitSpace;
+import merisis.traitspace.MerisisVM;
import merisis.util.BitUtil;
import org.apache.solr.util.OpenBitSet;
@@ -29,7 +29,7 @@
protected ContentCloud cloud;
@Inject
- protected TraitSpace cvm;
+ protected MerisisVM cvm;
@Inject
protected History ht;
Modified: trunk/procilege/src/test/java/merisis/contentcloud/ContentCloudTest1.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/contentcloud/ContentCloudTest1.java (original)
+++ trunk/procilege/src/test/java/merisis/contentcloud/ContentCloudTest1.java Thu Jun 7 00:40:28 2007
@@ -146,9 +146,9 @@
private long[] findLatestPdfDocByLable(long lbl) {
- cvm.pickup(nm("tag"), lbl);
+ cvm.source(nm("tag"), lbl);
cvm.focus();
- cvm.tspectrum(lbl, nm("tag"));
+ cvm.tprism(lbl, nm("tag"));
cvm.tcomplementary();
long[] prop1 = cvm.read();
@@ -159,9 +159,9 @@
OpenBitSet bs = new OpenBitSet();
for (int i = 0; i < prop1.length; i++) {
- cvm.pickup(prop1[i], nm("content-type"), nm("pdf"));
+ cvm.source(prop1[i], nm("content-type"), nm("pdf"));
cvm.focus();
- cvm.tspectrum(nm("pdf"), nm("content-type"));
+ cvm.tprism(nm("pdf"), nm("content-type"));
cvm.tcomplementary();
long[] prop2 = cvm.read();
if (prop2 == null)
@@ -179,9 +179,9 @@
private long findExactPdfDocByLable(long lbl) {
- cvm.pickup(nm("tag"), lbl);
+ cvm.source(nm("tag"), lbl);
cvm.focus();
- cvm.tspectrum(lbl, nm("tag"));
+ cvm.tprism(lbl, nm("tag"));
cvm.tcomplementary();
long[] prop1 = cvm.read();
@@ -192,9 +192,9 @@
OpenBitSet bs = new OpenBitSet();
for (int i = 0; i < prop1.length; i++) {
- cvm.pickup(prop1[i], nm("content-type"), nm("pdf"));
+ cvm.source(prop1[i], nm("content-type"), nm("pdf"));
cvm.focus();
- cvm.tspectrum(nm("pdf"), nm("content-type"));
+ cvm.tprism(nm("pdf"), nm("content-type"));
cvm.tcomplementary();
long[] prop2 = cvm.read();
if (prop2 == null)
Modified: trunk/procilege/src/test/java/merisis/traitspace/AbstractTraitSpaceTest.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/AbstractTraitSpaceTest.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/AbstractTraitSpaceTest.java Thu Jun 7 00:40:28 2007
@@ -25,7 +25,7 @@
public abstract class AbstractTraitSpaceTest {
@Inject
- protected TraitSpace ts;
+ protected MerisisVM mvm;
@Inject
protected History ht;
Modified: trunk/procilege/src/test/java/merisis/traitspace/MorphismIsaTest.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/MorphismIsaTest.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/MorphismIsaTest.java Thu Jun 7 00:40:28 2007
@@ -25,7 +25,7 @@
long isa = n("isa");
- ts.zoomin(n("T0"));
+ mvm.zoomin(n("T0"));
try {
mp.set(isa, n("a"), n("b"));
mp.set(isa, n("b"), n("c"));
@@ -44,7 +44,7 @@
Assert.assertFalse(mp.exists(isa, n("b"), n("b")));
Assert.assertFalse(mp.exists(isa, n("c"), n("c")));
} finally {
- ts.exit();
+ mvm.exit();
}
}
}
Modified: trunk/procilege/src/test/java/merisis/traitspace/MorphismTest1.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/MorphismTest1.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/MorphismTest1.java Thu Jun 7 00:40:28 2007
@@ -32,7 +32,7 @@
ht.emerge(n("T0"), n("e"));
ht.emerge(n("T0"), n("f"));
- ts.zoomin(n("T0"));
+ mvm.zoomin(n("T0"));
try {
mp.set(n("f1"), n("a"), n("d"));
mp.set(n("f1"), n("b"), n("d"));
@@ -70,7 +70,7 @@
.domain(n("f1"), n("f"), true));
} finally {
- ts.exit();
+ mvm.exit();
}
}
}
Modified: trunk/procilege/src/test/java/merisis/traitspace/Sketch1Test.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/Sketch1Test.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/Sketch1Test.java Thu Jun 7 00:40:28 2007
@@ -12,56 +12,56 @@
ht.emerge(1, 2);
ht.emerge(1, 3);
- ts.pickup(1);
- ts.focus(2);
- assertSetEquals(ay(1), ts.read());
-
- ts.pickup(2);
- ts.focus(1);
- assertSetEquals(null, ts.read());
-
- ts.pickup(3);
- ts.focus(1);
- assertNull(ts.read());
-
- ts.pickup(2, 3);
- ts.focus(1);
- assertNull(ts.read());
-
- ts.pickup(1, 3);
- ts.focus(3);
- assertSetEquals(ay(3), ts.read());
-
- ts.pickup(1, 3);
- ts.focus(null);
- assertSetEquals(ay(3), ts.read());
-
- ts.pickup(1, 3);
- ts.focus(2);
- assertNull(ts.read());
-
- ts.pickup(1);
- ts.focus(1);
- assertSetEquals(ay(1), ts.read());
-
- ts.pickup(1);
- ts.focus(null);
- assertSetEquals(ay(2, 3), ts.read());
-
- ts.pickup(2);
- ts.focus(2);
- assertSetEquals(ay(2), ts.read());
-
- ts.pickup(3);
- ts.focus(3);
- assertSetEquals(ay(3), ts.read());
-
- ts.pickup(2);
- ts.focus(3);
- assertNull(ts.read());
-
- ts.pickup(3);
- ts.focus(2);
- assertNull(ts.read());
+ mvm.source(1);
+ mvm.focus(2);
+ assertSetEquals(ay(1), mvm.read());
+
+ mvm.source(2);
+ mvm.focus(1);
+ assertSetEquals(null, mvm.read());
+
+ mvm.source(3);
+ mvm.focus(1);
+ assertNull(mvm.read());
+
+ mvm.source(2, 3);
+ mvm.focus(1);
+ assertNull(mvm.read());
+
+ mvm.source(1, 3);
+ mvm.focus(3);
+ assertSetEquals(ay(3), mvm.read());
+
+ mvm.source(1, 3);
+ mvm.focus(null);
+ assertSetEquals(ay(3), mvm.read());
+
+ mvm.source(1, 3);
+ mvm.focus(2);
+ assertNull(mvm.read());
+
+ mvm.source(1);
+ mvm.focus(1);
+ assertSetEquals(ay(1), mvm.read());
+
+ mvm.source(1);
+ mvm.focus(null);
+ assertSetEquals(ay(2, 3), mvm.read());
+
+ mvm.source(2);
+ mvm.focus(2);
+ assertSetEquals(ay(2), mvm.read());
+
+ mvm.source(3);
+ mvm.focus(3);
+ assertSetEquals(ay(3), mvm.read());
+
+ mvm.source(2);
+ mvm.focus(3);
+ assertNull(mvm.read());
+
+ mvm.source(3);
+ mvm.focus(2);
+ assertNull(mvm.read());
}
}
Modified: trunk/procilege/src/test/java/merisis/traitspace/Sketch2Test.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/Sketch2Test.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/Sketch2Test.java Thu Jun 7 00:40:28 2007
@@ -13,36 +13,36 @@
ht.emerge(1, 2);
ht.emerge(2, 3);
- ts.pickup(10);
- ts.focus(null);
- assertSetEquals(ay(3), ts.read());
-
- ts.pickup(10);
- ts.focus(1);
- assertSetEquals(ay(10), ts.read());
-
- ts.pickup(10);
- ts.focus(2);
- assertSetEquals(ay(1), ts.read());
-
- ts.pickup(10);
- ts.focus(3);
- assertSetEquals(ay(2), ts.read());
-
- ts.pickup(1);
- ts.focus(3);
- assertSetEquals(ay(2), ts.read());
-
- ts.pickup(10, 1);
- ts.focus(3);
- assertSetEquals(ay(2), ts.read());
-
- ts.pickup(1);
- ts.focus(3);
- assertSetEquals(ay(2), ts.read());
-
- ts.pickup(2);
- ts.focus(2);
- assertSetEquals(ay(2), ts.read());
+ mvm.source(10);
+ mvm.focus(null);
+ assertSetEquals(ay(3), mvm.read());
+
+ mvm.source(10);
+ mvm.focus(1);
+ assertSetEquals(ay(10), mvm.read());
+
+ mvm.source(10);
+ mvm.focus(2);
+ assertSetEquals(ay(1), mvm.read());
+
+ mvm.source(10);
+ mvm.focus(3);
+ assertSetEquals(ay(2), mvm.read());
+
+ mvm.source(1);
+ mvm.focus(3);
+ assertSetEquals(ay(2), mvm.read());
+
+ mvm.source(10, 1);
+ mvm.focus(3);
+ assertSetEquals(ay(2), mvm.read());
+
+ mvm.source(1);
+ mvm.focus(3);
+ assertSetEquals(ay(2), mvm.read());
+
+ mvm.source(2);
+ mvm.focus(2);
+ assertSetEquals(ay(2), mvm.read());
}
}
Modified: trunk/procilege/src/test/java/merisis/traitspace/Sketch3Test.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/Sketch3Test.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/Sketch3Test.java Thu Jun 7 00:40:28 2007
@@ -15,29 +15,29 @@
ht.emerge(1, 2);
ht.emerge(1, 3);
- ts.pickup(10);
- ts.focus(null);
- assertSetEquals(ay(2, 3), ts.read());
+ mvm.source(10);
+ mvm.focus(null);
+ assertSetEquals(ay(2, 3), mvm.read());
- ts.pickup(10, 20);
- ts.focus(null);
- assertSetEquals(ay(2, 3), ts.read());
+ mvm.source(10, 20);
+ mvm.focus(null);
+ assertSetEquals(ay(2, 3), mvm.read());
- ts.pickup(10);
- ts.focus(3);
- assertSetEquals(ay(1), ts.read());
+ mvm.source(10);
+ mvm.focus(3);
+ assertSetEquals(ay(1), mvm.read());
- ts.pickup(10,1);
- ts.focus(3);
- assertSetEquals(ay(1), ts.read());
+ mvm.source(10,1);
+ mvm.focus(3);
+ assertSetEquals(ay(1), mvm.read());
- ts.pickup(10,1);
- ts.focus(null);
- assertSetEquals(ay(2,3), ts.read());
+ mvm.source(10,1);
+ mvm.focus(null);
+ assertSetEquals(ay(2,3), mvm.read());
- ts.pickup(10, 20);
- ts.focus(2,3);
- assertSetEquals(ay(1), ts.read());
+ mvm.source(10, 20);
+ mvm.focus(2,3);
+ assertSetEquals(ay(1), mvm.read());
}
}
Modified: trunk/procilege/src/test/java/merisis/traitspace/Sketch4Test.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/Sketch4Test.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/Sketch4Test.java Thu Jun 7 00:40:28 2007
@@ -12,21 +12,21 @@
ht.emerge(1, 2);
ht.emerge(3, 2);
- ts.pickup(1,2);
- ts.focus(null);
- assertSetEquals(ay(2), ts.read());
+ mvm.source(1,2);
+ mvm.focus(null);
+ assertSetEquals(ay(2), mvm.read());
- ts.pickup(1,2);
- ts.focus(2);
- assertSetEquals(ay(2), ts.read());
-
- ts.pickup(1);
- ts.focus(2);
- assertSetEquals(ay(1), ts.read());
+ mvm.source(1,2);
+ mvm.focus(2);
+ assertSetEquals(ay(2), mvm.read());
+
+ mvm.source(1);
+ mvm.focus(2);
+ assertSetEquals(ay(1), mvm.read());
- ts.pickup(3);
- ts.focus(2);
- assertSetEquals(ay(3), ts.read());
+ mvm.source(3);
+ mvm.focus(2);
+ assertSetEquals(ay(3), mvm.read());
}
@Test
@@ -36,25 +36,25 @@
ht.emerge(4, 5);
ht.emerge(5, 6);
- ts.pickup(4);
- ts.focus(null);
- assertSetEquals(ay(6), ts.read());
-
- ts.pickup(4);
- ts.focus(6);
- assertSetEquals(ay(5), ts.read());
-
- ts.pickup(4);
- ts.focus(5);
- assertSetEquals(ay(4), ts.read());
+ mvm.source(4);
+ mvm.focus(null);
+ assertSetEquals(ay(6), mvm.read());
+
+ mvm.source(4);
+ mvm.focus(6);
+ assertSetEquals(ay(5), mvm.read());
+
+ mvm.source(4);
+ mvm.focus(5);
+ assertSetEquals(ay(4), mvm.read());
- ts.pickup(5);
- ts.focus(6);
- assertSetEquals(ay(5), ts.read());
-
- ts.pickup(5);
- ts.focus(5);
- assertSetEquals(ay(5), ts.read());
+ mvm.source(5);
+ mvm.focus(6);
+ assertSetEquals(ay(5), mvm.read());
+
+ mvm.source(5);
+ mvm.focus(5);
+ assertSetEquals(ay(5), mvm.read());
}
@Test
@@ -66,42 +66,42 @@
ht.emerge(14, 13);
ht.emerge(13, 12);
- ts.pickup(10);
- ts.focus(null);
- assertSetEquals(ay(12), ts.read());
- ts.roll(1);
- assertSetEquals(ay(11), ts.read());
-
- ts.pickup(14);
- ts.focus(null);
- assertSetEquals(ay(12), ts.read());
- ts.roll(1);
- assertSetEquals(ay(13), ts.read());
-
- ts.pickup(10, 14);
- ts.focus(null);
- assertSetEquals(ay(12), ts.read());
- ts.roll(1);
- assertSetEquals(null, ts.read());
-
- ts.pickup(10, 14);
- ts.focus(12);
- assertSetEquals(ay(12), ts.read());
-
- ts.pickup(10);
- ts.focus(12);
- assertSetEquals(ay(11), ts.read());
-
- ts.pickup(14);
- ts.focus(12);
- assertSetEquals(ay(13), ts.read());
-
- ts.pickup(12);
- ts.focus(12);
- assertSetEquals(ay(12), ts.read());
-
- ts.pickup(11);
- ts.focus(11);
- assertSetEquals(ay(11), ts.read());
+ mvm.source(10);
+ mvm.focus(null);
+ assertSetEquals(ay(12), mvm.read());
+ mvm.roll(1);
+ assertSetEquals(ay(11), mvm.read());
+
+ mvm.source(14);
+ mvm.focus(null);
+ assertSetEquals(ay(12), mvm.read());
+ mvm.roll(1);
+ assertSetEquals(ay(13), mvm.read());
+
+ mvm.source(10, 14);
+ mvm.focus(null);
+ assertSetEquals(ay(12), mvm.read());
+ mvm.roll(1);
+ assertSetEquals(null, mvm.read());
+
+ mvm.source(10, 14);
+ mvm.focus(12);
+ assertSetEquals(ay(12), mvm.read());
+
+ mvm.source(10);
+ mvm.focus(12);
+ assertSetEquals(ay(11), mvm.read());
+
+ mvm.source(14);
+ mvm.focus(12);
+ assertSetEquals(ay(13), mvm.read());
+
+ mvm.source(12);
+ mvm.focus(12);
+ assertSetEquals(ay(12), mvm.read());
+
+ mvm.source(11);
+ mvm.focus(11);
+ assertSetEquals(ay(11), mvm.read());
}
}
Modified: trunk/procilege/src/test/java/merisis/traitspace/Sketch5Test.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/Sketch5Test.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/Sketch5Test.java Thu Jun 7 00:40:28 2007
@@ -20,32 +20,32 @@
ht.emerge(6, 8);
ht.emerge(7, 8);
- ts.pickup(1);
- ts.focus(null);
- assertSetEquals(ay(8), ts.read());
-
- ts.pickup(1);
- ts.focus(3);
- assertSetEquals(ay(2, 4), ts.read());
-
- ts.pickup(2);
- ts.focus(null);
- assertSetEquals(ay(8), ts.read());
-
- ts.pickup(2);
- ts.focus(8);
- assertSetEquals(ay(6, 7), ts.read());
-
- ts.pickup(2);
- ts.focus(7);
- assertSetEquals(ay(5), ts.read());
-
- ts.pickup(2);
- ts.focus(3, 7);
- assertSetEquals(ay(2), ts.read());
-
- ts.pickup(2);
- ts.focus(6);
- assertSetEquals(ay(3), ts.read());
+ mvm.source(1);
+ mvm.focus(null);
+ assertSetEquals(ay(8), mvm.read());
+
+ mvm.source(1);
+ mvm.focus(3);
+ assertSetEquals(ay(2, 4), mvm.read());
+
+ mvm.source(2);
+ mvm.focus(null);
+ assertSetEquals(ay(8), mvm.read());
+
+ mvm.source(2);
+ mvm.focus(8);
+ assertSetEquals(ay(6, 7), mvm.read());
+
+ mvm.source(2);
+ mvm.focus(7);
+ assertSetEquals(ay(5), mvm.read());
+
+ mvm.source(2);
+ mvm.focus(3, 7);
+ assertSetEquals(ay(2), mvm.read());
+
+ mvm.source(2);
+ mvm.focus(6);
+ assertSetEquals(ay(3), mvm.read());
}
}
Modified: trunk/procilege/src/test/java/merisis/traitspace/Sketch6Test.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/Sketch6Test.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/Sketch6Test.java Thu Jun 7 00:40:28 2007
@@ -22,28 +22,28 @@
ht.emerge(5, 7);
ht.emerge(8, 7);
- ts.pickup(9, 1);
- ts.focus();
- assertSetEquals(ay(6, 7), ts.read());
+ mvm.source(9, 1);
+ mvm.focus();
+ assertSetEquals(ay(6, 7), mvm.read());
- ts.pickup(9);
- ts.focus(6);
- assertSetEquals(ay(3, 4), ts.read());
+ mvm.source(9);
+ mvm.focus(6);
+ assertSetEquals(ay(3, 4), mvm.read());
- ts.pickup(4,1);
- ts.focus(6);
- assertSetEquals(ay(4), ts.read());
+ mvm.source(4,1);
+ mvm.focus(6);
+ assertSetEquals(ay(4), mvm.read());
- ts.pickup(3,1);
- ts.focus(6);
- assertSetEquals(ay(6), ts.read());
+ mvm.source(3,1);
+ mvm.focus(6);
+ assertSetEquals(ay(6), mvm.read());
- ts.pickup(9);
- ts.focus(4);
- assertSetEquals(ay(2), ts.read());
+ mvm.source(9);
+ mvm.focus(4);
+ assertSetEquals(ay(2), mvm.read());
- ts.pickup(1);
- ts.focus(6);
- assertSetEquals(ay(4), ts.read());
+ mvm.source(1);
+ mvm.focus(6);
+ assertSetEquals(ay(4), mvm.read());
}
}
Modified: trunk/procilege/src/test/java/merisis/traitspace/Sketch7Test.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/Sketch7Test.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/Sketch7Test.java Thu Jun 7 00:40:28 2007
@@ -34,18 +34,18 @@
// different with the case 1.
ht.emerge(6, 5);
- ts.pickup(1);
- ts.focus(11);
- ts.roll(0);
- assertSetEquals(ay(7, 9), ts.read());
- ts.roll(1);
- assertSetEquals(ay(5), ts.read());
- ts.roll(2);
- assertSetEquals(ay(6), ts.read());
- ts.roll(3);
- assertSetEquals(ay(1), ts.read());
- ts.roll(4);
- assertSetEquals(null, ts.read());
+ mvm.source(1);
+ mvm.focus(11);
+ mvm.roll(0);
+ assertSetEquals(ay(7, 9), mvm.read());
+ mvm.roll(1);
+ assertSetEquals(ay(5), mvm.read());
+ mvm.roll(2);
+ assertSetEquals(ay(6), mvm.read());
+ mvm.roll(3);
+ assertSetEquals(ay(1), mvm.read());
+ mvm.roll(4);
+ assertSetEquals(null, mvm.read());
}
@Test
@@ -78,17 +78,17 @@
// different with the case 1.
ht.emerge(5, 6);
- ts.pickup(1);
- ts.focus(11);
- assertSetEquals(ay(7, 9), ts.read());
- ts.roll(1);
- assertSetEquals(ay(6), ts.read());
- ts.roll(2);
- assertSetEquals(ay(5), ts.read());
- ts.roll(3);
- assertSetEquals(ay(1), ts.read());
- ts.roll(4);
- assertSetEquals(null, ts.read());
+ mvm.source(1);
+ mvm.focus(11);
+ assertSetEquals(ay(7, 9), mvm.read());
+ mvm.roll(1);
+ assertSetEquals(ay(6), mvm.read());
+ mvm.roll(2);
+ assertSetEquals(ay(5), mvm.read());
+ mvm.roll(3);
+ assertSetEquals(ay(1), mvm.read());
+ mvm.roll(4);
+ assertSetEquals(null, mvm.read());
}
@Test
@@ -119,12 +119,12 @@
ht.emerge(5, 6);
- ts.pickup(1);
- ts.focus();
- assertSetEquals(ay(13), ts.read());
-
- ts.pickup(3, 4);
- ts.focus();
- assertSetEquals(ay(13), ts.read());
+ mvm.source(1);
+ mvm.focus();
+ assertSetEquals(ay(13), mvm.read());
+
+ mvm.source(3, 4);
+ mvm.focus();
+ assertSetEquals(ay(13), mvm.read());
}
}
Modified: trunk/procilege/src/test/java/merisis/traitspace/Spectrum1Test.java
==============================================================================
--- trunk/procilege/src/test/java/merisis/traitspace/Spectrum1Test.java (original)
+++ trunk/procilege/src/test/java/merisis/traitspace/Spectrum1Test.java Thu Jun 7 00:40:28 2007
@@ -23,21 +23,21 @@
ht.emerge(9, 11);
ht.emerge(10, 11);
- ts.pickup(1,2);
- ts.focus();
- assertSetEquals(ay(11), ts.read());
- ts.tspectrum(4);
- assertSetEquals(ay(7,8), ts.read());
+ mvm.source(1,2);
+ mvm.focus();
+ assertSetEquals(ay(11), mvm.read());
+ mvm.tprism(4);
+ assertSetEquals(ay(7,8), mvm.read());
- ts.tcomplementary();
- assertSetEquals(null, ts.read());
+ mvm.tcomplementary();
+ assertSetEquals(null, mvm.read());
- ts.pickup(1,2);
- ts.focus(11);
- assertSetEquals(ay(9), ts.read());
- ts.tspectrum(4);
- assertSetEquals(ay(8), ts.read());
- ts.tcomplementary();
- assertSetEquals(ay(1), ts.read());
+ mvm.source(1,2);
+ mvm.focus(11);
+ assertSetEquals(ay(9), mvm.read());
+ mvm.tprism(4);
+ assertSetEquals(ay(8), mvm.read());
+ mvm.tcomplementary();
+ assertSetEquals(ay(1), mvm.read());
}
}
Modified: trunk/procilege/src/test/java/procilege/test/TestZero.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/TestZero.java (original)
+++ trunk/procilege/src/test/java/procilege/test/TestZero.java Thu Jun 7 00:40:28 2007
@@ -11,7 +11,7 @@
import merisis.contentcloud.ContentCloud;
import merisis.sense.SenseMaker;
-import merisis.traitspace.TraitSpace;
+import merisis.traitspace.MerisisVM;
import procilege.Procilege;
import procilege.compiler.PalCompiler;
@@ -42,7 +42,7 @@
private Logger logger;
@Inject
- private TraitSpace ctsp;
+ private MerisisVM ctsp;
@SuppressWarnings("unused")
@Inject
Modified: trunk/procilege/src/test/java/procilege/test/pal/AbstractPalTest.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/pal/AbstractPalTest.java (original)
+++ trunk/procilege/src/test/java/procilege/test/pal/AbstractPalTest.java Thu Jun 7 00:40:28 2007
@@ -6,7 +6,7 @@
import merisis.sense.SenseMaker;
import merisis.traitspace.History;
-import merisis.traitspace.TraitSpace;
+import merisis.traitspace.MerisisVM;
import merisis.util.BitUtil;
import org.apache.solr.util.OpenBitSet;
@@ -55,7 +55,7 @@
protected ComputationalEntityMgr cem;
@Inject
- protected TraitSpace cvm;
+ protected MerisisVM mvm;
@Inject
private Procilege pclg;
Modified: trunk/procilege/src/test/java/procilege/test/pal/ComputationalEntityMgrTest1.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/pal/ComputationalEntityMgrTest1.java (original)
+++ trunk/procilege/src/test/java/procilege/test/pal/ComputationalEntityMgrTest1.java Thu Jun 7 00:40:28 2007
@@ -16,7 +16,7 @@
@Test
public void test1() {
- cvm.zoomin(nm("testcase"));
+ mvm.zoomin(nm("testcase"));
def(nn("p1"), pvm(nn("a")));
dumpHistory(0, 30);
Modified: trunk/procilege/src/test/java/procilege/test/pal/ComputationalEntityMgrTest2.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/pal/ComputationalEntityMgrTest2.java (original)
+++ trunk/procilege/src/test/java/procilege/test/pal/ComputationalEntityMgrTest2.java Thu Jun 7 00:40:28 2007
@@ -21,7 +21,7 @@
@Test
public void test1() {
- cvm.zoomin(nm("testcase"));
+ mvm.zoomin(nm("testcase"));
def(nn("p1"), pvm(nn("a")));
dumpHistory(0, 30);
Modified: trunk/procilege/src/test/java/procilege/test/pal/EntityIsATest1.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/pal/EntityIsATest1.java (original)
+++ trunk/procilege/src/test/java/procilege/test/pal/EntityIsATest1.java Thu Jun 7 00:40:28 2007
@@ -21,11 +21,11 @@
@Test
public void test1() {
- cvm.zoomin(nm("T0"));
+ mvm.zoomin(nm("T0"));
try {
} finally {
- cvm.exit();
+ mvm.exit();
}
Modified: trunk/procilege/src/test/java/procilege/test/pal/EntityPropertyTest1.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/pal/EntityPropertyTest1.java (original)
+++ trunk/procilege/src/test/java/procilege/test/pal/EntityPropertyTest1.java Thu Jun 7 00:40:28 2007
@@ -9,7 +9,7 @@
@Test
public void test() {
- cvm.zoomin(nm("T0"));
+ mvm.zoomin(nm("T0"));
try {
cem.setEntityProperty(nn("d1"), "title", "MyTitle1");
@@ -30,7 +30,7 @@
assertEquals("2004", cem.getEntityProperty(nn("d2"), "year"));
assertEquals("2007", cem.getEntityProperty(nn("d1"), "year"));
} finally {
- cvm.exit();
+ mvm.exit();
}
}
}
Modified: trunk/procilege/src/test/java/procilege/test/pal/RecursivePrivilegeTest.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/pal/RecursivePrivilegeTest.java (original)
+++ trunk/procilege/src/test/java/procilege/test/pal/RecursivePrivilegeTest.java Thu Jun 7 00:40:28 2007
@@ -12,7 +12,7 @@
@Test
public void norm() {
- cvm.zoomin(nm("TT"));
+ mvm.zoomin(nm("TT"));
try {
PrivExprComposition pfexpr;
@@ -47,7 +47,7 @@
assertTrue(z.available(z.ln("q")));
} finally {
- cvm.exit();
+ mvm.exit();
}
}
}
Modified: trunk/procilege/src/test/java/procilege/test/simplecase/SimpleCaseTest.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/simplecase/SimpleCaseTest.java (original)
+++ trunk/procilege/src/test/java/procilege/test/simplecase/SimpleCaseTest.java Thu Jun 7 00:40:28 2007
@@ -22,7 +22,7 @@
@Test
public void playWithoutSubstitution() {
- cvm.zoomin(nm("tc"));
+ mvm.zoomin(nm("tc"));
try {
tell("let dtn1 is dnotes");
@@ -66,7 +66,7 @@
z.tell("let usr1 is manager");
assertTrue(pfa.available(pfa.privform(z.ln("guard"))));
} finally {
- cvm.exit();
+ mvm.exit();
}
}