Code

Formatchange#1

Code

Open

ian-beaver wants to merge 80 commits intosergeyplis:mastersergeyplis/gunfolds:masterfrom ian-beaver:formatchangeian-beaver/gunfolds:formatchangeCopy head branch name to clipboard

+8,684-8,220

Commits

Commits on Jul 31, 2015

• Added conversion function to change dict format of graphs to use ints for edges

  

  Ian Beaver

  committed
  50d686f

  Copy full SHA for 50d686f

Commits on Aug 3, 2015

• Finished converting to module and cleaning up imports, started adding tests

  

  Ian Beaver

  committed
  dc68da7

  Copy full SHA for dc68da7

• Added files from directory restructure

  

  Ian Beaver

  committed
  65614ba

  Copy full SHA for 65614ba

Commits on Aug 4, 2015

• Moved conversion functions into their own module. Refactored and removed duplicate functions.

  

  Ian Beaver

  committed
  8a0672a

  Copy full SHA for 8a0672a

Commits on Aug 5, 2015

• Finished cursorary cleanup of unused and duplicate functions. All code removed has been placed in old/unused.py for reference.

  

  Ian Beaver

  committed
  47fc895

  Copy full SHA for 47fc895

Commits on Aug 6, 2015

• Undersampling and tests converted

  

  Ian Beaver

  committed
  b92bb3c

  Copy full SHA for b92bb3c

• converted bfutils, comparison, conversions to new format

  

  Ian Beaver

  committed
  6e9712c

  Copy full SHA for 6e9712c

Commits on Aug 7, 2015

• Fixed pickle loading to happen lazily so imports dont take forever

  

  Ian Beaver

  committed
  e9adf2a

  Copy full SHA for e9adf2a

Commits on Aug 8, 2015

• More files converted

  

  Ian Beaver

  committed
  c16b36e

  Copy full SHA for c16b36e

• Working on traversal.py

  

  Ian Beaver

  committed
  3c09028

  Copy full SHA for 3c09028

Commits on Aug 13, 2015

• Fixed import

  

  Ian Beaver

  committed
  d2a9609

  Copy full SHA for d2a9609

• Added tests and removed more unused code

  

  Ian Beaver

  committed
  734d5ce

  Copy full SHA for 734d5ce

• Removed more unused code

  

  Ian Beaver

  committed
  86072b5

  Copy full SHA for 86072b5

• Removed more unused code

  

  Ian Beaver

  committed
  a514a76

  Copy full SHA for a514a76

• Added a new test

  

  Ian Beaver

  committed
  b28ba60

  Copy full SHA for b28ba60

• Added a new tests

  

  Ian Beaver

  committed
  01e821f

  Copy full SHA for 01e821f

• Added a new tests

  

  Ian Beaver

  committed
  43aea96

  Copy full SHA for 43aea96

• Added a new tests

  

  Ian Beaver

  committed
  f46c5c8

  Copy full SHA for f46c5c8

• Removed more unused code

  

  Ian Beaver

  committed
  67e4666

  Copy full SHA for 67e4666

• Added a new tests and converted more code

  

  Ian Beaver

  committed
  5204c7d

  Copy full SHA for 5204c7d

• Added a new tests and converted more code

  

  Ian Beaver

  committed
  eba5092

  Copy full SHA for eba5092

Commits on Aug 14, 2015

• Finished converting tools directory, cleaned up more unused code

  

  Ian Beaver

  committed
  75f006a

  Copy full SHA for 75f006a

• Added all dependant zkl files and commented out from gitignore

  

  Ian Beaver

  committed
  03f9931

  Copy full SHA for 03f9931

Commits on Aug 15, 2015

• Incorporated Sergeys bug fix

  

  Ian Beaver

  committed
  8c211cc

  Copy full SHA for 8c211cc

Commits on Aug 18, 2015

• Sergeys workaround

  

  Ian Beaver

  committed
  eebd701

  Copy full SHA for eebd701

• Sergeys workaround

  

  Ian Beaver

  committed
  ee86315

  Copy full SHA for ee86315

• Sergeys patch

  

  Ian Beaver

  committed
  f7a4d9e

  Copy full SHA for f7a4d9e

• Fixed test output file after bug was patched by Sergey

  

  Ian Beaver

  committed
  f04b27c

  Copy full SHA for f04b27c

• Added back traversal test from branch

  

  Ian Beaver

  committed
  be16ac7

  Copy full SHA for be16ac7

• Traversal test passing with old format

  

  Ian Beaver

  committed
  938ca13

  Copy full SHA for 938ca13

• finished converting all scripts

  

  Ian Beaver

  committed
  545cdf8

  Copy full SHA for 545cdf8

• Reverted workaround

  

  Ian Beaver

  committed
  de25c0d

  Copy full SHA for de25c0d

• Reverted workaround

  

  Ian Beaver

  committed
  8b79a3b

  Copy full SHA for 8b79a3b

• Somehow the bug fix merge didnt take, so added it back in

  

  Ian Beaver

  committed
  079cef5

  Copy full SHA for 079cef5

Commits on Aug 19, 2015

• added import of permutations

  sergeyplis

  committed
  65521da

  Copy full SHA for 65521da

Commits on Sep 11, 2015

• option 1 for the SAT4U project is implemented and now

  Show description for c094ee2
  sergeyplis

  committed
  c094ee2

  Copy full SHA for c094ee2

• option 2 is also implemented

  sergeyplis

  committed
  f640744

  Copy full SHA for f640744

Commits on Sep 28, 2015

• changes to account for clingo and conversion to clingo file

  sergeyplis

  committed
  78d2abc

  Copy full SHA for 78d2abc

• scripting changes

  sergeyplis

  committed
  2a8b12b

  Copy full SHA for 2a8b12b

Commits on Oct 7, 2015

• added an explicit threshold parameter

  sergeyplis

  committed
  c31202a

  Copy full SHA for c31202a

• using multiple linear regression for the test

  sergeyplis

  committed
  dd06840

  Copy full SHA for dd06840

• just the working process of parameter playing

  sergeyplis

  committed
  2d8cd5e

  Copy full SHA for 2d8cd5e

Commits on Oct 12, 2015

• weighted version of clingo

  sergeyplis

  committed
  c7dd31e

  Copy full SHA for c7dd31e

Commits on Oct 24, 2015

• scropting and linear models

  sergeyplis

  committed
  c45079b

  Copy full SHA for c45079b

• scripts

  sergeyplis

  committed
  99bd918

  Copy full SHA for 99bd918

Commits on Oct 27, 2015

• getting rid of the gmpy dependency

  sergeyplis

  committed
  d0976be

  Copy full SHA for d0976be

• another minus gmpy dependency

  sergeyplis

  committed
  9ed835c

  Copy full SHA for 9ed835c

• a slight tweak to conversion g2num

  sergeyplis

  committed
  e8ccfbe

  Copy full SHA for e8ccfbe

Commits on Feb 24, 2017

• a, hopefully, faster g2num

  sergeyplis

  committed
  60b82b7

  Copy full SHA for 60b82b7

• optimizations

  sergeyplis

  committed
  0ca09ad

  Copy full SHA for 0ca09ad

• getting rid of gmpy

  sergeyplis

  committed
  de64406

  Copy full SHA for de64406

• just using the script and playing with parameters

  sergeyplis

  committed
  017437f

  Copy full SHA for 017437f

• importing sys module and corrected the path to the figure template

  sergeyplis

  committed
  9c7b049

  Copy full SHA for 9c7b049

• got rid of gmpy dependency

  sergeyplis

  committed
  229e158

  Copy full SHA for 229e158

• and even the commented out version

  sergeyplis

  committed
  3a33de0

  Copy full SHA for 3a33de0

• distribution to sample from

  sergeyplis

  committed
  0c6098e

  Copy full SHA for 0c6098e

• plotting functions for rasl paper

  sergeyplis

  committed
  80e4808

  Copy full SHA for 80e4808

• clingo

  sergeyplis

  committed
  15832aa

  Copy full SHA for 15832aa

Commits on Feb 25, 2017

• Merge blackbolt:/na/homes/splis/soft/src/dev/craft/ian/gunfolds into formatchange

  sergeyplis

  committed
  59ec611

  Copy full SHA for 59ec611

• removed the old representation function

  sergeyplis

  committed
  21cde8e

  Copy full SHA for 21cde8e

• clingo solver for MSL algorithm

  sergeyplis

  committed
  bfa20f1

  Copy full SHA for bfa20f1

• removed the weighted version hooks

  sergeyplis

  committed
  2e4f317

  Copy full SHA for 2e4f317

• help string to dens2edgenum

  sergeyplis

  committed
  e6c87f9

  Copy full SHA for e6c87f9

Commits on Feb 26, 2017

• added python-igraph and removed igraph from requirements

  sergeyplis

  committed
  c75bb60

  Copy full SHA for c75bb60

Commits on Feb 27, 2017

• a function to convert the old to new representation

  sergeyplis

  committed
  3d0fe4b

  Copy full SHA for 3d0fe4b

• made nameid work

  sergeyplis

  committed
  f673493

  Copy full SHA for f673493

• fixed incorrect linebreak

  sergeyplis

  committed
  5e1386e

  Copy full SHA for 5e1386e

Commits on Mar 1, 2017

• adding close_fds=True and also closing the stdout manually

  sergeyplis

  committed
  791c4ad

  Copy full SHA for 791c4ad

• was closing too early

  sergeyplis

  committed
  031b638

  Copy full SHA for 031b638

• fixed a bug: a graph was incorrectly converted to a vector :(

  sergeyplis

  committed
  4b7e33b

  Copy full SHA for 4b7e33b

Commits on Mar 3, 2017

• Merge branch 'formatchange'

  sergeyplis

  committed
  bf98382

  Copy full SHA for bf98382

Commits on Mar 4, 2017

• removing old2new, as it is already define in conversions

  Show description for 63172b2
  sergeyplis

  committed
  63172b2

  Copy full SHA for 63172b2

• convert Ian's representation to the old one

  sergeyplis

  committed
  b34d6ec

  Copy full SHA for b34d6ec

Commits on Mar 6, 2017

• turned out one does not need prefix '0b' for int conversion

  Show description for 63753f2
  sergeyplis

  committed
  63753f2

  Copy full SHA for 63753f2

• fixed a bug in increment() function

  sergeyplis

  committed
  8864026

  Copy full SHA for 8864026

• replaced conversion routines g2num and num2CG, the old ones did not match each other

  sergeyplis

  committed
  ff11e6c

  Copy full SHA for ff11e6c

• graph_tool binding to plot compressed graphs

  sergeyplis

  committed
  f506ffb

  Copy full SHA for f506ffb

• Merged upstream changes from sergey's github

  

  Ian Beaver

  committed
  35c93a8

  Copy full SHA for 35c93a8

• Merged upstream changes from sergey's github

  

  Ian Beaver

  committed
  eb4d8ad

  Copy full SHA for eb4d8ad

• Merged Sergey's gitlab changes

  

  Ian Beaver

  committed
  a1abd31

  Copy full SHA for a1abd31