Version 1.0.21

Gui can read in several csv-files in one go BugFix for reading in several csv-files New Grouping option - group by psm-count -still experimental boosting happens now on count of targets summary file contains more information different way to represent unique PSMs to reduce the memory requirements - the representative PSM simply holds a list of represented PSMs Some objects references get released earlier so they can be freed up. - helps keeping memory consumption a bit down, especially during boosting faster way to filter what lower level matches get retained as a result of an higher level fdr
lutzfischer · Nov 23, 2017 · 5848057 · 5848057
1 parent fe7402a
commit 5848057
Show file tree

Hide file tree

Showing 28 changed files with 3,635 additions and 957 deletions.
diff --git a/hs_err_pid31369.log b/hs_err_pid31369.log
diff --git a/nb-configuration.xml b/nb-configuration.xml
@@ -21,4 +21,7 @@ Any value defined here will override the pom.xml file value but is only applicab
         <netbeans.hint.license>apache20</netbeans.hint.license>
         <org-netbeans-modules-javascript2-requirejs.enabled>false</org-netbeans-modules-javascript2-requirejs.enabled>
     </properties>
+    <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
+        <word>psms</word>
+    </spellchecker-wordlist>
 </project-shared-configuration>
diff --git a/nbactions.xml b/nbactions.xml
@@ -1,46 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-        <action>
-            <actionName>run</actionName>
-            <packagings>
-                <packaging>jar</packaging>
-            </packagings>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
-            </goals>
-            <properties>
-                <exec.args>-Xms1g -classpath %classpath org.rappsilber.fdr.gui.FDRGUI</exec.args>
-                <exec.executable>java</exec.executable>
-            </properties>
-        </action>
-        <action>
-            <actionName>debug</actionName>
-            <packagings>
-                <packaging>jar</packaging>
-            </packagings>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
-            </goals>
-            <properties>
-                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -Xms1g -classpath %classpath org.rappsilber.fdr.gui.FDRGUI</exec.args>
-                <exec.executable>java</exec.executable>
-                <jpda.listen>true</jpda.listen>
-            </properties>
-        </action>
-        <action>
-            <actionName>profile</actionName>
-            <packagings>
-                <packaging>jar</packaging>
-            </packagings>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
-            </goals>
-            <properties>
-                <exec.args>-Xms1g -classpath %classpath org.rappsilber.fdr.gui.FDRGUI</exec.args>
-                <exec.executable>java</exec.executable>
-            </properties>
-        </action>
-    </actions>
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>run</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-Xmx11g -XX:+HeapDumpOnOutOfMemoryError -classpath %classpath org.rappsilber.fdr.gui.FDRGUI</exec.args>
+                <exec.executable>java</exec.executable>
+                <exec.workingdir>/home/lfischer</exec.workingdir>
+            </properties>
+        </action>
+        <action>
+            <actionName>debug</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -Xmx11g -XX:+HeapDumpOnOutOfMemoryError -classpath %classpath org.rappsilber.fdr.gui.FDRGUI</exec.args>
+                <exec.executable>java</exec.executable>
+                <jpda.listen>true</jpda.listen>
+                <exec.workingdir>/home/lfischer</exec.workingdir>
+            </properties>
+        </action>
+        <action>
+            <actionName>profile</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-Xmx11g -XX:+HeapDumpOnOutOfMemoryError -classpath %classpath org.rappsilber.fdr.gui.FDRGUI</exec.args>
+                <exec.executable>java</exec.executable>
+                <exec.workingdir>/home/lfischer</exec.workingdir>
+            </properties>
+        </action>
+    </actions>
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.rappsilberlab</groupId>
     <artifactId>xiFDR</artifactId>
-    <version>1.0.20</version>
+    <version>1.0.21</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>