Changeset 162

Timestamp:

07/28/08 15:08:13 (16 years ago)

Author:

ra33

Message:

Added faster versions of search frameset

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (7 diffs)
• actions/NavigationActions.java (modified) (1 diff)
• actions/Simple.java (modified) (7 diffs)
• agents/SearchAgent.java (modified) (4 diffs)
• agents/SearchFrameset.java (modified) (1 diff)
• agents/SearchFramesetFast.java (added)
• agents/SearchFramesetNoResults.java (added)
• gui/DisplayIO.java (modified) (2 diffs)
• gui/FrameIO.java (modified) (10 diffs)
• gui/FrameMouseActions.java (modified) (1 diff)
• simple/ExpediteeJEP.java (modified) (4 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -25 +25 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.gui.TimeKeeper;
 import org.expeditee.items.Item;
+import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Text;
 import org.expeditee.simple.ExpediteeJEP;
@@ -155 +157 @@
                 getFromChildFrame(current, false);
         }
+        
+        public static void GetItemsFromChildFrame(Item current) {
+                getItemsFromChildFrame(current, false);
+        }
 
         /**
@@ -180 +186 @@
                 item.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
                 item.setParent(null);
-
                 FrameMouseActions.pickup(item);
+                FrameGraphics.Repaint();
+        }
+        
+        private static void getItemsFromChildFrame(Item current, boolean textOnly) {
+                Collection<Item> items = getItemsOnChildFrame(current, textOnly);
+                // if no item was found
+                if (items == null || items.size() == 0) {
+                        return;
+                }
+
+                // copy the item and switch
+                Collection<Item> copies = ItemUtils.CopyItems(items);
+                float deltaX = DisplayIO.getMouseX();
+                float deltaY = FrameMouseActions.getY();
+                for(Item i: copies){
+                        i.setXY(i.getX() + deltaX, i.getY() + deltaY);
+                        i.setParent(null);
+                }
+                FrameMouseActions.pickup(copies);
                 FrameGraphics.Repaint();
         }
@@ -657 +681 @@
                 return item;
         }
+        
+        private static Collection<Item> getItemsOnChildFrame(Item current,
+                        boolean textOnly) {
+                // the item must link to a frame
+                if (current.getLink() == null) {
+                        MessageBay
+                                        .displayMessage("Cannot get item from child - this item has no link");
+                        return null;
+                }
+                Frame child = FrameIO.LoadFrame(current.getAbsoluteLink());
+
+                // if the frame could not be loaded
+                if (child == null) {
+                        MessageBay.errorMessage("Could not load child frame.");
+                        return null;
+                }
+
+                // find the first non-title and non-name item
+                Collection<Item> body = new ArrayList<Item>();
+                if (textOnly)
+                        body.addAll(child.getBodyTextItems(false));
+                else
+                        body.addAll(child.getItems());
+                
+                return body;
+        }
 
         public static void calculate(Frame frame, Item toCalculate) {
@@ -667 +717 @@
                                 myParser.addVariables(FrameIO.LoadFrame(linkedFrame));
                         }
-                        myParser.addObserver();
+                        myParser.resetObserver();
 
                         // Do the calculation
@@ -677 +727 @@
                                 String result = myParser.getResult();
                                 if (result == null) {
-                                        MessageBay.errorMessage(myParser.getErrorInfo().replace("\n",
-                                        ""));
+                                        MessageBay.errorMessage(myParser.getErrorInfo().replace(
+                                                        "\n", ""));
                                 } else {
                                         text.setText(result);
@@ -685 +735 @@
                                                                 FrameMouseActions.MouseY);
                                                 FrameMouseActions.resetOffset();
+                                        } else {
+                                                text.getParentOrCurrentFrame().change();
                                         }
                                 }

trunk/src/org/expeditee/actions/NavigationActions.java

@@ -5 +5 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameCreator;
+import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 
 /**

trunk/src/org/expeditee/actions/Simple.java

@@ -162 +162 @@
                 do {
                         next = FrameIO.LoadNext(next);
-                } while (next != null && next.isTestFrame());
+                } while (next != null && !next.isTestFrame());
                 FrameUtils.DisplayFrame(next, true);
         }
@@ -170 +170 @@
                 do {
                         prev = FrameIO.LoadPrevious(prev);
-                } while (prev != null && prev.isTestFrame());
+                } while (prev != null && !prev.isTestFrame());
 
                 FrameUtils.DisplayFrame(prev, true);
@@ -783 +783 @@
                         // Check for set statements
                 } else if (tokens[0].startsWith("calculatestring")) {
-                        assertMinParametreCount(tokens, 2);
-                        String toCalculate = context.getPrimitives().getStringValue(tokens[1]);
+                        assertMinParametreCount(tokens, 1);
+                        String toCalculate = context.getPrimitives().getStringValue(
+                                        tokens[1]);
                         boolean result = true;
+                        String error = "";
                         ExpediteeJEP myParser = new ExpediteeJEP();
-                        //Add the variables in the system
+                        // Add the variables in the system
                         context.getPrimitives().addToParser(myParser);
                         Node equation = myParser.parseExpression(toCalculate);
-                        //TODO get the answer
-                        
+                        // TODO get the answer
+                        if (equation == null) {
+                                result = false;
+                                error = myParser.getErrorInfo().replace("\n", "");
+                        } else {
+                                double value = myParser.getValue();
+                                if (myParser.hasError()) {
+                                        result = false;
+                                        error = myParser.getErrorInfo().replace("\n", "");
+                                } else {
+                                        // Add a new variable if its an assignment statement
+                                        String newVar = myParser.getNewVariable();
+                                        if (newVar.length() > 0) {
+                                                try {
+                                                        context.getPrimitives().setValue(newVar,
+                                                                        new SReal(value));
+                                                } catch (IncorrectTypeException e) {
+                                                        result = false;
+                                                        error = e.getMessage();
+                                                }
+                                        }
+                                        if (tokens.length > 2) {
+                                                context.getPrimitives().setValue(tokens[2],
+                                                                new SReal(value));
+                                        }
+                                }
+                        }
+                        // Set the result variable if there is one
+                        if (tokens.length > 3) {
+                                context.getPrimitives().setValue(tokens[3],
+                                                new SBoolean(result));
+                                // Set the result variable if there is one
+                                if (tokens.length > 4 && !result) {
+                                        context.getPrimitives().setValue(tokens[4], error);
+                                }
+                        }
                 } else if (tokens[0].startsWith("calculateitem")) {
                         assertMinParametreCount(tokens, 1);
                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
-                        Item item = (Item)context.getPointers().getVariable(tokens[1]).getValue();
+                        Item item = (Item) context.getPointers().getVariable(tokens[1])
+                                        .getValue();
                         Frame frame = null;
-                        if(tokens.length > 2){
+                        if (tokens.length > 2) {
                                 assertVariableType(tokens[2], 2, SPointer.framePrefix);
-                                frame = (Frame)context.getPointers().getVariable(tokens[2]).getValue();
+                                frame = (Frame) context.getPointers().getVariable(tokens[2])
+                                                .getValue();
                         }
                         Misc.calculate(frame, item);
-                }else if (tokens[0].startsWith("issearchpatternvalid")) {
+                } else if (tokens[0].startsWith("issearchpatternvalid")) {
                         assertExactParametreCount(tokens, 2);
                         boolean result = true;
@@ -885 +923 @@
                                 String pattern = context.getPrimitives().getStringValue(
                                                 tokens[2]);
-                                SearchAgent searchAgent = new SearchFrameset();
+                                long firstFrame = 1;
+                                long maxFrame = Long.MAX_VALUE;
+                                if(tokens.length > 7){
+                                        firstFrame = context.getPrimitives().getIntegerValue(tokens[7]);
+                                        if(tokens.length > 8){
+                                                maxFrame = context.getPrimitives().getIntegerValue(tokens[8]);
+                                        }
+                                }
+                                
+                                SearchAgent searchAgent = new SearchFrameset(firstFrame, maxFrame);
                                 searchAgent.initialise(null, null, frameset, resultsFrameset,
                                                 replacementString, pattern);
@@ -1187 +1234 @@
                                                         .getStringValue(tokens[1]), context.getPrimitives()
                                                         .getStringValue(tokens[2]));
+                        } else if (tokens[0].equals("assertequalframes")) {
+                                assertExactParametreCount(tokens, 2);
+                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                                assertVariableType(tokens[2], 2, SPointer.framePrefix);
+                                Frame frame1 = (Frame) context.getPointers().getVariable(
+                                                tokens[1]).getValue();
+                                Frame frame2 = (Frame) context.getPointers().getVariable(
+                                                tokens[2]).getValue();
+                                // Check that all the items on the frame are the same
+                                List<Item> items1 = frame1.getVisibleItems();
+                                List<Item> items2 = frame2.getVisibleItems();
+                                if (items1.size() != items2.size()) {
+                                        throw new UnitTestFailedException(items1.size() + " items",
+                                                        items2.size() + " items");
+                                } else {
+                                        for (int i = 0; i < items1.size(); i++) {
+                                                Item i1 = items1.get(i);
+                                                Item i2 = items2.get(i);
+                                                String s1 = i1.getText();
+                                                String s2 = i2.getText();
+                                                if (!s1.equals(s2)) {
+                                                        throw new UnitTestFailedException(s1, s2);
+                                                }
+                                        }
+                                }
                         } else if (tokens[0].equals("assertdefined")) {
                                 assertExactParametreCount(tokens, 1);
@@ -1193 +1265 @@
                                                         "not defined");
                                 }
+                        } else {
+                                throw new RuntimeException("Invalid Assert statement");
                         }
                 } else if (tokens[0].startsWith("goto")) {
@@ -1957 +2031 @@
                                 freshCopy.setFrameset(destinationFrameset);
                         }// Otherwise add it to the end of this frameset
-                        freshCopy.setFrameNumber(FrameIO.getLastNumber(freshCopy
-                                        .getFramesetName()) + 1);
-                        context.getPointers().setObject(tokens[2], freshCopy);
-                        String fileContents = FrameIO.ForceSaveFrame(freshCopy);
+                        int nextNumber = FrameIO.getLastNumber(freshCopy.getFramesetName()) + 1;
+                        // if the frameset doesnt already exist then create it
+                        if (nextNumber <= 0) {
+                                try {
+                                        FrameIO.CreateFrameset(freshCopy.getFramesetName(),
+                                                        frameToCopy.path);
+                                        nextNumber = 1;
+                                } catch (Exception e) {
+                                }
+                        }
+                        boolean success = false;
+                        if (nextNumber > 0) {
+                                freshCopy.setFrameNumber(nextNumber);
+                                context.getPointers().setObject(tokens[2], freshCopy);
+                                String fileContents = FrameIO.ForceSaveFrame(freshCopy);
+                                success = fileContents != null;
+                        }
                         FrameIO.ResumeCache();
-                        // Need to add the new copy to the cache in case it is edited by
-                        // other simple statements
-                        FrameIO.addToCache(freshCopy);
-                        boolean success = fileContents != null;
+                        if (success) {
+                                // Need to add the new copy to the cache in case it is edited by
+                                // other simple statements
+                                FrameIO.addToCache(freshCopy);
+                        }
                         if (!success && _verbose)
                                 MessageBay.warningMessage("Error copying "

trunk/src/org/expeditee/agents/SearchAgent.java

@@ -11 +11 @@
 public abstract class SearchAgent extends DefaultAgent {
 
+        private static final String DEFAULT_RESULTS_FRAMESET = "SearchResults";
+        
         protected FrameCreator _results;
 
@@ -26 +28 @@
                 //TODO use a results frame specified on the profile frame
                 if (item.getLink() == null) {
-                        resultFrameset = frame.getFramesetName();
+                        resultFrameset = DEFAULT_RESULTS_FRAMESET;
                 } else {
                         resultFrameset = Conversion.getFramesetName(item.getAbsoluteLink(),
@@ -36 +38 @@
         public boolean initialise(Frame frame, Item item, String startName, String resultsFrameset,
                         String replacementString, String pattern) {
-                _pattern = pattern;
+                _pattern = pattern.toLowerCase();
                 _replacementString = replacementString;
                 _startName = startName;
@@ -58 +60 @@
                         String replacementString) {
                 String searchStr = itemToSearch.getText().toLowerCase();
-                String[] result = searchStr.split(pattern.toLowerCase(), 2);
-                boolean bFound = result.length > 1;
+                boolean bFound = searchStr.matches(pattern.toLowerCase());
                 // If it is a find and replace... then replace with the replacement
                 // string

trunk/src/org/expeditee/agents/SearchFrameset.java

@@ -5 +5 @@
 
 public class SearchFrameset extends SearchAgent {
+        private long _firstFrame = 1;
+        private long _maxFrame = Integer.MAX_VALUE;
+        
+        public SearchFrameset(long firstFrame, long maxFrame) {
+                _firstFrame = firstFrame;
+                _maxFrame = maxFrame;
+        }
+        
+        public SearchFrameset() {
+                super();
+        }
 
         @Override
         protected Frame process(Frame frame) {
                 int count = FrameIO.getLastNumber(_startName);
-                for (int i = 1; i < count; i++) {
+                for (long i = _firstFrame;i <= _maxFrame && i < count; i++) {
                         if (_stop) {
                                 break;

trunk/src/org/expeditee/gui/DisplayIO.java

@@ -62 +62 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp22Jul2008A";
+        public static final String TITLE = "Exp28Jul2008A";
 
         private DisplayIO() {
@@ -605 +605 @@
                 Frame frame = FrameIO.LoadFrame(_VisitedFrames[side].pop());
                 // If the top frame on the backup stack is the current frame go back
-                // again...
-                if (frame.equals(getCurrentFrame())) {
+                // again... or if it has been deleted
+                //Recursively backup the stack
+                if(frame == null || frame.equals(getCurrentFrame())) {
                         Back();
                         return;

trunk/src/org/expeditee/gui/FrameIO.java

@@ -5 +5 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
@@ -10 +11 @@
 import java.io.IOException;
 import java.sql.Time;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedList;
 
 import org.expeditee.agents.ExistingFramesetException;
@@ -239 +242 @@
         }
 
+        public static Collection<String> searchFrame(String frameName,
+                        String pattern, String path) {
+                String fullPath = null;
+                if (path == null) {
+                        for (String possiblePath : UserSettings.FrameDirs) {
+                                fullPath = getFrameFullPathName(possiblePath, frameName);
+                                if (fullPath != null)
+                                        break;
+                        }
+                } else {
+                        fullPath = getFrameFullPathName(path, frameName);
+                        assert(fullPath != null);
+                }
+                // If the frame was not located return null
+                if (fullPath == null)
+                        return null;
+                Collection<String> results = new LinkedList<String>();
+                // Open the file and search the text items
+                try {
+                        BufferedReader reader = new BufferedReader(new FileReader(fullPath));
+                        String next;
+                        while (reader.ready() && ((next = reader.readLine()) != null)) {
+                                if (next.startsWith("T")) {
+                                        String toSearch = next.substring(2);
+                                        if (toSearch.toLowerCase().matches(pattern))
+                                                results.add(toSearch);
+                                }
+                        }
+                } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                        return null;
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+                return results;
+        }
+
         private static Frame LoadFrame(String path, String frameName) {
                 String fullPath = getFrameFullPathName(path, frameName);
@@ -349 +389 @@
                 // if we did not find another Frame then this one must be the last one
                 // in the frameset
-                MessageBay
-                                .displayMessageOnce("This is the last frame in the frameset");
+                MessageBay.displayMessageOnce("This is the last frame in the frameset");
                 return null;
         }
@@ -421 +460 @@
          * @param toDelete
          *            The Frame to be deleted
-         * @return The name the deleted frame was changed to, or null if the delete failed
+         * @return The name the deleted frame was changed to, or null if the delete
+         *         failed
          */
         public static String DeleteFrame(Frame toDelete) throws IOException,
@@ -468 +508 @@
                 ff.close();
 
-                if( del.delete()){
+                if (del.delete()) {
                         return toDelete.getName();
                 }
-                
+
                 return null;
         }
@@ -552 +592 @@
                                 i.setLink(null);
                 }
-                
+
                 // do auto shrinking of the title IF not in twin frames mode
                 Item titleItem = template.getTitleItem();
@@ -676 +716 @@
                         boolean checkBackup) {
 
-                // TODO When loading a frame maybe append onto the event history too- with a
+                // TODO When loading a frame maybe append onto the event history too-
+                // with a
                 // break to indicate the end of a session
 
-                if (toSave == null ||!toSave.hasChanged() || toSave.isSaved()){
+                if (toSave == null || !toSave.hasChanged() || toSave.isSaved()) {
                         SessionStats.NewFrameSession();
                         return "";
@@ -691 +732 @@
 
                 // Dont save if the frame is protected and it exists
-                if (checkBackup
-                                && toSave.isReadOnly()) {
+                if (checkBackup && toSave.isReadOnly()) {
                         _Cache.remove(toSave.getName().toLowerCase());
                         SessionStats.NewFrameSession();
@@ -776 +816 @@
                         toSave.setActiveTime(activeTime);
 
-                        //int oldMode = FrameGraphics.getMode();
-                        //if (oldMode != FrameGraphics.MODE_XRAY)
-                        //      FrameGraphics.setMode(FrameGraphics.MODE_XRAY, true);
+                        // int oldMode = FrameGraphics.getMode();
+                        // if (oldMode != FrameGraphics.MODE_XRAY)
+                        // FrameGraphics.setMode(FrameGraphics.MODE_XRAY, true);
                         writer.writeFrame(toSave);
-                        //FrameGraphics.setMode(oldMode, true);
+                        // FrameGraphics.setMode(oldMode, true);
                         toSave.setSaved();
                         if (inc) {

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -797 +797 @@
                                         refreshHighlights();
                                 }
+                                FrameGraphics.requestRefresh(true);
                                 return;
                                 // otherwise, anchor the items

trunk/src/org/expeditee/simple/ExpediteeJEP.java

@@ -13 +13 @@
 
 public class ExpediteeJEP extends JEP {
-        Observer observer = new Observer() {
-                private String _attribute = "";
-
-                public void update(Observable ob, Object o) {
-                        _attribute = ((Variable) o).getName() + ": ";
-                }
-
-                @Override
-                public String toString() {
-                        return _attribute;
-                }
-        };
+        Observer observer = null;
         
         public ExpediteeJEP() {
@@ -33 +22 @@
                 setAllowAssignment(true);
                 setAllowUndeclared(true);
+                resetObserver();
         }
         
-        public void addObserver() {
+        public void resetObserver() {
+                observer = new Observer() {
+                        private String _attribute = "";
+
+                        public void update(Observable ob, Object o) {
+                                _attribute = ((Variable) o).getName();
+                        }
+
+                        @Override
+                        public String toString() {
+                                return _attribute;
+                        }
+                };
                 getSymbolTable().addObserver(observer);
                 getSymbolTable().addObserverToExistingVariables(observer);
@@ -48 +50 @@
                 nf.setMinimumFractionDigits(0);
                 nf.setMaximumFractionDigits(15);
-                return observer.toString() + nf.format(result);
+                return observer.toString()+ ": " + nf.format(result);
         }
 
@@ -63 +65 @@
                 }
         }
+
+        public String getNewVariable() {
+                return observer.toString();
+        }
 }