Skip to content

Commit

Permalink
Merge pull request #15 from synthicity/agpl-license
Browse files Browse the repository at this point in the history
Switch to AGPL license
  • Loading branch information
jiffyclub committed Feb 11, 2015
2 parents 32f0be6 + 33d925b commit 8811879
Show file tree
Hide file tree
Showing 13 changed files with 721 additions and 27 deletions.
706 changes: 679 additions & 27 deletions LICENSE.txt

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions activitysim/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.
4 changes: 4 additions & 0 deletions activitysim/activitysim.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.

import urbansim.sim.simulation as sim
from urbansim.urbanchoice import interaction, mnl
import pandas as pd
Expand Down
3 changes: 3 additions & 0 deletions activitysim/defaults/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.
4 changes: 4 additions & 0 deletions activitysim/defaults/datasources.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.

import numpy as np
import pandas as pd
import os
Expand Down
4 changes: 4 additions & 0 deletions activitysim/defaults/variables.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.

import urbansim.sim.simulation as sim
from activitysim.defaults import datasources

Expand Down
4 changes: 4 additions & 0 deletions activitysim/skim.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.

import numpy as np


Expand Down
3 changes: 3 additions & 0 deletions activitysim/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.
4 changes: 4 additions & 0 deletions activitysim/tests/test_skim.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.

import numpy as np
import numpy.testing as npt
import pytest
Expand Down
3 changes: 3 additions & 0 deletions activitysim/util/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.
3 changes: 3 additions & 0 deletions activitysim/util/test/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.
3 changes: 3 additions & 0 deletions activitysim/util/test/test_testing.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.

import pandas as pd
import pytest
Expand Down
4 changes: 4 additions & 0 deletions activitysim/util/testing.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# ActivitySim
# Copyright (C) 2014-2015 Synthicity, LLC
# See full license in LICENSE.txt.

"""
Utilities used in testing of UrbanSim.
Expand Down

0 comments on commit 8811879

Please sign in to comment.