Columns
");
+changed type of parameter "symbol" from Symbol to Symbol
+changed to use SVNPathUtil.tail()
+changed the order of the lines in the diff
+getter should be allowed
+the diff is a change to the url.setText line
+the first line is the diff header
+added ClassLoaderUtils.class
+changed the package name
+changed the order of the if/else blocks
+changed "BinaryBlockWriter" to "BinaryBlockWriter"
+removed the if statement that checks for port being in bounds
+the first time we run a diff, we need to create the index
+the first line is the diff header
+the "withProtection" method was added
+changed the return type from Predicate to Predicate
+changed the method signature to take a timeout parameter
+removed the "name" parameter
+the original method is commented out
+the first line was added
+the first time, the file is found, the md5 is computed, the statements are generated, the md5 is computed again
+
+the first line is the same
+the diff is about the package name of the home activity
+the first line is a comment
+changed the diff to use the new ClusterManager class
+changed the order of the if/then statements
+removed the "if" statement that was checking for the existence of the
+changed type of EXTRA_SKIP_UNINSTALL_CONFIRMATION from boolean to String
+the first line is the same
+removed the deprecated method
+changed the name of the variable
+the diff is about the following lines:
+the superclass method was removed
+changed class name
+the first line is a copy of the original
+changed "this.from = block.getRelative(face.getModX(), face.getModY(), face.getModZ());" to "this.from = block.getRelative(face.getModX(), face.getModY(), face.getModZ());"
+the first line was added
+
+changed type of parameter "moduleClass" from "Class" to "Class
+changed the type of store from HashMap to ConcurrentMap
+changed camelContext to camelContext
+the first line is the diff header
+changed package name
+the first line is the diff header
+removed the @Override annotation
+the diff is a bunch of additions to the end of the file
+the first time we use LuceneTestCase, which has some initialization that
+the first line is removed,
+removed the if statement that was checking if the component was already focused
+the first line was added
+added the permissionAsked variable
+changed the setAvatar method to take a byte[] and a String
+added super.tearDown()
+added a new import
+the first line is the same
+the method name is changed
+57,8 +57,7 is the diff between the lines that start with "//~ Constructors"
+changed the if statement to return false
+changed the return type of isValidBlockType() from boolean to int
diff --git a/output/commit/prompt0/codegen1-multi-2B.output b/output/commit/prompt0/codegen1-multi-2B.output
new file mode 100644
index 0000000..769ab5a
--- /dev/null
+++ b/output/commit/prompt0/codegen1-multi-2B.output
@@ -0,0 +1,95 @@
+35,7 +35,7 = 51,7
+77,7:
+77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9: 77,9:
+39,6 + 39,7 = 39,8
+Filter.java:
+27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:27,10:27,8:
+140,7 +140,7
+613,10:
+80,6 +80,8 = 80,8
+170,8 +170,6 = 170,6
+186,9 +186,9 = 186,9
+38,7 +38,7 @@public class ClockwiseRotate implements LayoutBuilder {
+120,6:
+h generates only a shell
+43,7 +43,7 = 43,7
+242,8 - 242,7 = -1,1 = -242,8 - 242,7
+
+32,8 - 32,8
+2362,7 -2456,18 +2456,18
+193,7 -193,9 -33514d2..cc5b801 100644
+61,6 -> -61,7
+435,7 - 435,11
+453,7 +453,7 @@ public abstract class LoadBalancerContext 64,7
+11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11,6 +11,8 = -11
+22,7 +22,6 = 22,7
+51,7 +51,7 @@ import org.junit.runners.model.TestClass;
+717,7 +717,12 = 717,12
+added stopTimeout
+a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerUtil.java
+82,6 - 82,7 = 82,6
+6 lines of code
+311,7 +311,9
+49,7 + 48,7 = 1,822 bytes
+56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@ -56,8 + 56,8 @@
+48,6: a91de4b00f
+119,7 - 119,7
+68,6 +68,11 = 68,11
+Foo.prototype.bar_ is marked as BAD_PRIVATE_PROPERTY_ACCESS
+115,7 +115,9
+added HistoryStrategy
+26,6 +26,7 -26,6 +26,7 +121,6 -121,7
+821,7 +821,7 @@ public abstract class NanoHTTPD {
+66,6 +66,8 = -66,8
+22,7 +22,7 @@public class BinaryBlockWriter {
+90,8 +90,8 @@ -90,8 +90,8
+1.1.1.1 -1.1.1.2 -1.1.1.3 -1.1.1.4 -1.1.1.5 -1.1.1.6 -1.1.1.7 -1.1.1.8 -1.1.1.9 -1.1.1.10 -1.1.1.11 -1.1.1.12 -1.1.1.13 -1.1.1.14 -1.1.1.15 -1.1.1.16 -1.1.1.17 -1.1.1.18 -1.1.1.19 -1.1.1.20 -1.1.1.21 -1.1.1.22 -1.1.1.23 -1.1.1.24 -1.1.1.25 -1.1.1.26 -1.1.1.27 -1.1.1.28 -1.1.1.29 -1.1.1.30 -1.1.1.31 -1.1.1.32 -1.1.1.33 -1.1.1.34 -1.1.1.35 -1.1.1.36 -1.1.1.37 -1.1.1.38 -1.1.1.39 -1.1.1.40 -1.1.1.41 -1.1.1.42 -1.1.1.43 -1.1.1.44 -1.1.1.45 -1.1.1.46 -1.1.1.47 -1.1.1.48 -1.1.1.49 -1.1.1.50 -1.1.1.51 -1.1.1.52 -1.1.1.53 -1.1.1.54 -1.1.1.55 -1.1.1.56 -1.1.1.57 -1.1.1.58 -1.1.1.59 -1.1.1.60 -1.1.1.61 -1.1.1.62 -1.1.
+49,7 +49,18
+21,5 +21,33 = -21,5 +21,33
+436,6 +436,18 = 436,6
+307,12:
+added "name" and "unique" options
+59,6 +59,7 = 59,7
+diff of changes
+a/liquibase-core/src/test/java/liquibase/change/core/SQLFileChangeTest.java
+
+96,7 +96,7 @@ public class AddColumnGenerator extends AbstractSqlGenerator
+5126,6:
+131,8 +131,7 = 131,8
+4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +4 +
+144,7 +144,9 = 144,9
+112,6 +112,21 = 112,6
+1575,6 +1575,14 100644
+diff of changes
+451,7 +451,10 = 451,7
+73,7 +73,7 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment {
+61,6:
+Added onFocusChanged()
+a/jodd-db/src/main/java/jodd/db/connection/ConnectionProvider.java
+80,9 -80,17 +80,17 +80,9
+9,14 +9,14 @@ -9,14 +9,14 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8 +34,8 @@ -34,8
+398,7 +398,7 @@ public abstract class Repository extends RepositoryInfo {
+
+moduleName:
+28,8 +28,8 = 0
+added AggregationStrategy
+topLeftX is now topLeftX - margin
+added CamelOutputStream
+95,6 +95,7
+a/advanced/src/main/java/org/neo4j/kernel/impl/ha/LockStatus.java
+157,7 +157,7 = 172,18
+20,6 +20,7 = 413,7
+62,9 - 62,6 = 1 line
+getFocusedComponent() -> getFocusedComponentImpl()
+346,7 +346,7 @@ public final class SugarDataSource {
+602,7 + 602,7
+add avatar
+479,7..479,8
+21,6 +21,7 = -69,6 +70,7 = 69,6
+61,7 +62,11 = 61,7
+ChangeProvider.getChanges()
+57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,7:57,
+253,7 - 253,9 = -253,7
+670,7 +670,7 = 670,7
diff --git a/output/commit/prompt0/codegen1-multi-350M.output b/output/commit/prompt0/codegen1-multi-350M.output
new file mode 100644
index 0000000..faa95f1
--- /dev/null
+++ b/output/commit/prompt0/codegen1-multi-350M.output
@@ -0,0 +1,95 @@
+http://code.google.com/p/netty/issues/detail?id=35
+a new line
+the first line of the file is commented out
+the contact id
+antProject.getExecutor().executeTargets(antProject, new String[] { "test" });
+the method dispose() is called
+import org.apache.coyote.http11.Http11AprProtocol
+a) if (channel == null) {
+the file is deleted
+diff of changes
+Message: class = 0x00 (0x00), type = 0x00 (0x00), buffer = 0x00
+the difference between the two layouts
+delete container
+h
+a summary of the above diff
+the check below makes sence only for valid PsiElement
+
+the difference between the two lines above
+the difference between the two lines above
+generateHeaderId(0)
+http://www.parosproxy.org/paros/network/HttpSender.java
+the post this comment is on can only be requested if this is a.com blog or a
+diff of changes
+a new line
+a summary of the above diff
+output model
+index 09123fb..fee2f32 100644
+* The user's filename should be included in the config file name,
+mkdir
+a stop timeout of 0 means no stop timeout
+diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java
+if (nameAttributes == null) nameAttributes = new SimpleTextAttributes(Font.PLAIN, color);
+the first line of the diff is the first line of the class
+the first fragment
+a diff of changes
+a summary of the above diff is:
+a new reference for a symbol
+diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CmdStatusClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CmdStatusClient.java
+(1) verify(context).unregisterReceiver(dispatcher.receiver);
+a private property access
+diff --git a/app/src/main/java/io/plaidapp/ui/PostNewDesignerNewsStory.java b/app/src/main/java/io/plaidapp/ui/PostNewDesignerNewsStory.java
+the room subject is null
+a classpath provider for the core project
+a) parseBody()
+the parser model
+a summary of the above diff is:
+host = IDN.toASCII(host);
+diff --git a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
+displayProperties = true;
+a/curator-framework/src/main/java/com/netflix/curator/framework/api/ProtectACLCreateModePathAndBytesable.java
+create a predicate
+enter(long, TimeUnit)
+a.ensureIndex( a.keys, a.name, a.unique )
+read the file
+a summary of the above diff is:
+the file is not found
+
+diff --git a/liquibase-core/src/main/java/liquibase/sqlgenerator/core/AddColumnGenerator.java b/liquibase-core/src/main/java/liquibase/sqlgenerator/core/AddColumnGenerator.java
+the package name of the activity
+a list of all tasks
+a.java:
+weighted sum of squared response
+a summary of the above diff
+a summary of the above diff
+index:95e525039
+setOutputURI(conf, OUTPUT_URI)
+download via wifi switch
+diff of changes
+the above diff is the first one
+a.jodd.db.connection.ConnectionProvider.ConnectionProvider()
+the element is the parent of the next element
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+the date formatters are initialized
+
+moduleName: "com.taobao.weex.WXSDKEngine"
+a new core system
+diff of changes
+diff --git a/PreviewAPI/src/org/gephi/preview/PreviewControllerImpl.java b/PreviewAPI/src/org/gephi/preview/PreviewControllerImpl.java
+the first line is the first line of the file
+a new point is added to the target points
+import java.io.Serializable;
+java.lang.RuntimeException:
+diff:
+diff --git a/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java b/platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java
+a top component is set if the component is focused
+346: count = future.get();
+if (!permissionDone) {
+setAvatar(byte[] bytes, String mimeType)
+// + +--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskVcsTest.java
+a filter that returns true for the first item
+the file is not null
+Get changes from point of view of VCS
+a) the consumer manager
+diff of changes
+diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
diff --git a/output/commit/prompt0/codegen1-multi-6B.output b/output/commit/prompt0/codegen1-multi-6B.output
new file mode 100644
index 0000000..7cf095b
--- /dev/null
+++ b/output/commit/prompt0/codegen1-multi-6B.output
@@ -0,0 +1,95 @@
+35,7 +35,7 @@ public class HttpRequestEncoder extends HttpObjectEncoder {
+77,7 +77,9
+77,9 +77,9
+39,6 +348,8 = 347
+add a new field to the class
+added a comment
+add a new class
+add a new method to the interface
+80 lines of code added
+add a new method to the class
+Removed the 'private' modifier
+38,7 +38,7 @@ public class ClockwiseRotate implements LayoutBuilder {
+add a new method
+1,7 +1,7 @@
+43,7 +43,7 @@
+the first line is the same
+
+32,8 +32,8 @@ public class JSONPropertySupport {
+2362 lines changed
+add header id
+added the "initiator" constants
+435,7 + 435,11 = 435
+453,7 +453,7 @@ public abstract class LoadBalancerContext {
+90,8 +90,8
+if the index meta data didn't change, no need check for refreshed settings
+49,7 +49,18 @@ public class Ls extends NeoApp
+Removed the 'protected' keyword from the interface
+removed the "in"
+307 lines changed
+410,14 +410,15 @@ public abstract class DBCollection {
+remove all the XML-specific stuff
+add a new method onResolveInfoResult()
+diff of changes
+
+96,7 +96,7 @@ public class AddColumnGenerator extends AbstractSqlGenerator
+5126,6 +5126,11 = +5126
+131,8 +131,7 @@ public class TaskController extends AbstractController {
+426,8 +426,7 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
+diff of changes in the file
+112,6 +112,21
+1575,6 +1575,14 @@ public class Intent implements Parcelable, Cloneable {
+the first line is the old code
+451,7 +451,10
+73 chars
+added the "if (packet.getSubject() == null || "".equals(packet.getSubject().trim()))"
+248,9 +248,11 -248,9 +248,11
+34,7 +34,7 @@ import java.sql.Connection;
+80,9 + 80,17
+9,14 +9,14 @@
+the date pattern is not used in the repository
+
+345,7 +345,7 @@ public class WXSDKEngine {
+28,8+28,8
+add a new field to the class
+Removed the commented out code
+removed the package name
+added a new method to get the y coordinate of the point to navigate to
+added a new enum
+java_major: 1.6.0 -> 1.7.0
+add a new abstract class
+62 chars changed
+89,6 +89,7 @@ public class FocusWatcher implements ContainerListener,FocusListener{
+346,7 +346,7 @@ public final class SugarDataSource {
+add a new method to the class
+356,6 +356,26 @@ public class VCard extends IQ {
+479,7 +479,8 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
+21,6 +21,7 -69,6 +70,7
+1,6 +1,7 = -61,7 +62,11 = -1,7 +1,11
+26,9 +26,13 @@
+added a constructor with a ConsumerManager
+add the idempotent check
+added a check for material.getMaterial(type)!= null
diff --git a/render_output.py b/render_output.py
index 1d7dee9..dc6e6ab 100644
--- a/render_output.py
+++ b/render_output.py
@@ -4,21 +4,23 @@
class OutputRenderer:
def __init__(self, baseline=0.0, metric="(Unspecified metric)"):
- self.x_values = [0.35, 2.00, 6.00, 16.00]
+ self.x_values = [0.35, 2.70, 6.10, 16.10]
self.box_color = "Pink"
self.baseline = baseline
self.metric = metric
- def set_lim(self):
- # hardcoded based on our problem's specifications
+ def set_lim(self, y_max=None):
+ if y_max is None:
+ y_max = 1
+ # mostly hardcoded based on our problem's specifications
plt.xlim(-1, 17)
- plt.ylim(0, 1)
+ plt.ylim(0, y_max)
- def draw_box(self, ax):
+ def draw_box(self, ax, ys):
bplot = ax.boxplot(
- self.y_values,
+ ys,
positions=self.x_values,
widths=1,
manage_ticks=False,
@@ -30,29 +32,32 @@ def draw_box(self, ax):
for patch in bplot["boxes"]:
patch.set_facecolor(self.box_color)
- def draw_line(self, ax):
- medians = [median(vals) for vals in self.y_values]
+ def draw_line(self, ax, ys, label=None, color="b"):
+ medians = [median(vals) for vals in ys]
line = ax.plot(
self.x_values,
medians,
marker="o",
- color="b",
+ color=color,
linestyle="-",
markerfacecolor="none",
markeredgewidth=2,
markersize=8,
# alpha=0.5,
zorder=8,
+ label=label,
)
- def draw_random_annotation(self):
+ def draw_random_annotation(self, y_max=None):
plt.axhline(
y=self.baseline,
color="r",
# alpha=0.5,
zorder=2,
)
- offset = (-0.1, 0.02)
+ if y_max is None:
+ y_max = 1
+ offset = (-0.1, 0.02 * y_max)
plt.text(
plt.xlim()[0] + offset[0],
self.baseline + offset[1],
@@ -66,9 +71,9 @@ def meta_info(self):
plt.ylabel(self.metric)
plt.title("Model Performance")
- def draw_bands(self, ax):
- q1 = [np.percentile(val, 25) for val in self.y_values]
- q3 = [np.percentile(val, 75) for val in self.y_values]
+ def draw_bands(self, ax, ys, color="b"):
+ q1 = [np.percentile(val, 25) for val in ys]
+ q3 = [np.percentile(val, 75) for val in ys]
iqr = [b - a for a, b in zip(q1, q3)]
# print(q1, q3)
ax.fill_between(
@@ -77,7 +82,7 @@ def draw_bands(self, ax):
list(map(lambda x, y: x + 1.5 * y, q3, iqr)),
alpha=0.1,
zorder=5,
- color="b",
+ color=color,
)
ax.fill_between(
self.x_values,
@@ -85,27 +90,38 @@ def draw_bands(self, ax):
q3,
alpha=0.2,
zorder=5,
- color="b",
+ color=color,
)
- def render(self, ys):
- self.y_values = [
- y if isinstance(y, list)
- else [y]
- for y in ys
- ]
+ def render(self, ys, y_max=None):
+ y_lines = ys
+ if not isinstance(y_lines, dict):
+ y_lines = { "unnamed": y_lines }
+
+ for key, ys in y_lines.items():
+ ys = [
+ y if isinstance(y, list)
+ else [y]
+ for y in ys
+ ]
+ y_lines[key] = ys
fig = plt.figure(figsize=(10, 6))
ax1 = fig.add_subplot(111)
plt.grid(True)
- self.set_lim()
+ self.set_lim(y_max=y_max)
self.meta_info()
- self.draw_random_annotation()
-
- self.draw_bands(ax1)
- self.draw_line(ax1)
- self.draw_box(ax1)
+ self.draw_random_annotation(y_max=y_max)
+
+ colors = ["b", "g", "r"]
+ for idx, (key, ys) in enumerate(y_lines.items()):
+ color = colors[idx % len(colors)]
+ self.draw_bands(ax1, ys, color=color)
+ self.draw_line(ax1, ys, label=key, color=color)
+ self.draw_box(ax1, ys)
+
+ plt.legend()
plt.show()
\ No newline at end of file
diff --git a/timehelp.py b/timehelp.py
index 6ca4d7d..32fcdb8 100644
--- a/timehelp.py
+++ b/timehelp.py
@@ -58,25 +58,36 @@ def time_end():
display_now = datetime.today().strftime("%Y-%m-%d@%H:%M:%S")
print(f"[{display_now}|{timer_label}] Time elapsed:", fmt_delta(elapsed))
-def with_progress(steps=None, label=None):
+def with_progress(steps=None, label="Progress"):
assert steps is not None, "@with_progress: Missing required parameter steps"
- label = label or "Progress"
total_steps = steps
def decorator(func):
@wraps(func)
- def wrapper(*args, **kwargs):
+ def wrapper(*args, skip=None, **kwargs):
# Create widgets
- progress = widgets.IntProgress(value=0, min=0, max=total_steps, description=f"{label}:")
+ progress = widgets.IntProgress(
+ value=0, min=0, max=total_steps,
+ **(
+ dict(description=f"{label}:") if label
+ else {}
+ )
+ )
estimated_time = widgets.Label(value="Estimated time remaining: calculating...")
- # Combine progress bar and estimated time in a horizontal box
- hbox = widgets.HBox([progress, estimated_time])
+ hbox = widgets.VBox([progress, estimated_time])
display(hbox)
- # Start time
start_time = time.time()
-
- for step in range(total_steps):
+
+ start = 0
+ if skip is not None:
+ assert skip >= 0, f"Cannot skip {skip} lines"
+ start = skip
+
+ my_total_steps = total_steps - start
+ result = None
+ progress.value = start
+ for step in range(start, start + my_total_steps):
# Call the wrapped function
result = func(*args, **kwargs, step=step)
@@ -86,15 +97,24 @@ def wrapper(*args, **kwargs):
# Calculate and update estimated time remaining
elapsed_time = time.time() - start_time
remaining_steps = total_steps - (step + 1)
- if step > 0:
- time_per_step = elapsed_time / (step + 1)
+ steps_so_far = step + 1 - start
+ if steps_so_far > 1:
+ time_per_step = elapsed_time / steps_so_far
estimated_remaining_time = time_per_step * remaining_steps
- estimated_time.value = f"Estimated time remaining: {fmt_delta(estimated_remaining_time)}, {fmt_delta(elapsed_time)} elapsed..."
+ estimated_time.value = f"[{step + 1}/{total_steps}] ETA: {fmt_delta(estimated_remaining_time)}, {fmt_delta(elapsed_time)} elapsed..."
else:
- estimated_time.value = f"Estimated time remaining: calculating, {fmt_delta(elapsed_time)} elapsed..."
-
+ estimated_time.value = f"[{step + 1}/{total_steps}] ETA: calculating, {fmt_delta(elapsed_time)} elapsed..."
+
+ progress.value = total_steps
estimated_time.value = f"Done, {fmt_delta(time.time() - start_time)} elapsed."
+ print(estimated_time.value)
return result
return wrapper
return decorator
+
+
+def display_header(text):
+ header = widgets.HTML(value=f"{text}
")
+ display(header)
+ print(f"# {text}")