No commit message

intervals-mining-lab · Jul 22, 2011 · 0c83156 · 0c83156
1 parent e1702f2
commit 0c83156
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 5 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/resources/com/rapidminer/resources/OperatorsHMM.xml b/resources/com/rapidminer/resources/OperatorsHMM.xml
@@ -6,7 +6,13 @@
                 <group key="reader">
                     <operator>
                         <key>FASTAReader</key>
-                        <class>Bio.RapidMiner.FASTAReaderRM</class>
+                        <class>rapidminer.Bioinformatics.FASTAReaderRM</class>
+                    </operator>
+                </group>
+                <group key="ORF">
+                    <operator>
+                        <key>ORFFinder</key>
+                        <class>rapidminer.Bioinformatics.ORMFinderRM</class>
                     </operator>
                 </group>
             </group>
@@ -17,6 +23,10 @@
                     <key>Building characteristic</key>
                     <class>rapidminer.BuildingCharacteristicRM</class>
                 </operator>
+                <operator>
+                    <key>UBuilding characteristic</key>
+                    <class>rapidminer.chain.UBuildingCharacteristicRM</class>
+                </operator>
             </group>
             <group key="readers">
                 <operator>
@@ -36,13 +46,21 @@
                     </operator>
                 </group>
                 <operator>
-                    <key>Buildings counter</key>
-                    <class>interval_analysis.chain.RMBuildingCounter</class>
+                    <key>Event recombination</key>
+                    <class>rapidminer.chain.EventRecombinationRM</class>
                 </operator>
                 <operator>
-                    <key>Mixed_converter</key>
+                    <key>Mixed converter</key>
                     <class>rapidminer.chain.MixedConverterRM</class>
                 </operator>
+                <operator>
+                    <key>Chain decompositor</key>
+                    <class>rapidminer.chain.Decompositor.ChainDecompositorRM</class>
+                </operator>
+                <operator>
+                    <key>Buildings counter</key>
+                    <class>rapidminer.chain.RMBuildingCounter</class>
+                </operator>
             </group>
             <group key="contents">
                 <group key="generators">

diff --git a/src/libiada/IntervalAnalysis/Chain.java b/src/libiada/IntervalAnalysis/Chain.java
@@ -91,4 +91,24 @@ public double injectIntoCharacteristic(Class<? extends ICharacteristicCalculator
     public ChainWithCharacteristic getUniformChain(IBaseObject baseObject) {
         return null;  //TODO:"Fill method"
     }
+
+    public ChainWithCharacteristicSet getDecomposition(int wordLength, int step) throws Exception {
+        ChainWithCharacteristicSet chSet = new ChainWithCharacteristicSet();
+        int currentPos = 0;
+        int wordCount = Math.round((getLength() - wordLength) / step);
+        /*if (step == 1) {
+            wordCount -= (wordLength - 1);
+        }*/
+        for (int j = 0; j <= wordCount; j++) {
+            Chain ch = new Chain(wordLength);
+            int newWordPos = 0;
+            for (int i = currentPos; i < currentPos + wordLength; i++) {
+                ch.add(this.get(i), newWordPos);
+                newWordPos++;
+            }
+            currentPos += step;
+            chSet.add(ch);
+        }
+        return chSet;
+    }
 }
diff --git a/src/libiada/IntervalAnalysis/UniformChain.java b/src/libiada/IntervalAnalysis/UniformChain.java
@@ -57,7 +57,7 @@ protected void buildIntervals() throws Exception {
     private int getRight(int current) {
         for (int i = current + 1; i < getLength(); i++)
         {
-            if (vault.get(i) == 1)
+            if (vault.get(i) == getAlpahbet().getPower()-1)
             {
                 return i;
             }